summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-06-25 04:04:51 -0400
committerJohannes Berg <johannes.berg@intel.com>2019-07-20 15:37:26 -0400
commit1667e4f9bcfb6785362a300ac4486df0854a72aa (patch)
tree0046f32aaada6c9c74691e516b76fee2dd63df63 /drivers/net/wireless
parent1a03bb532934e90c7d662f7c59f4f66ea8451fa4 (diff)
wireless: fix nl80211 vendor commands
In my previous commit to validate a policy I neglected to actually add one to the few drivers using vendor commands, fix that now. Reported-by: Tony Lindgren <tony@atomide.com> Tested-by: Tony Lindgren <tony@atomide.com> Fixes: 901bb9891855 ("nl80211: require and validate vendor command policy") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/wil6210/cfg80211.c4
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c1
-rw-r--r--drivers/net/wireless/ti/wlcore/vendor_cmd.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index d436cc51dfd1..2fb4258941a5 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -177,6 +177,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
177 .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG, 177 .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG,
178 .flags = WIPHY_VENDOR_CMD_NEED_WDEV | 178 .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
179 WIPHY_VENDOR_CMD_NEED_RUNNING, 179 WIPHY_VENDOR_CMD_NEED_RUNNING,
180 .policy = wil_rf_sector_policy,
180 .doit = wil_rf_sector_get_cfg 181 .doit = wil_rf_sector_get_cfg
181 }, 182 },
182 { 183 {
@@ -184,6 +185,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
184 .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG, 185 .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG,
185 .flags = WIPHY_VENDOR_CMD_NEED_WDEV | 186 .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
186 WIPHY_VENDOR_CMD_NEED_RUNNING, 187 WIPHY_VENDOR_CMD_NEED_RUNNING,
188 .policy = wil_rf_sector_policy,
187 .doit = wil_rf_sector_set_cfg 189 .doit = wil_rf_sector_set_cfg
188 }, 190 },
189 { 191 {
@@ -192,6 +194,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
192 QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SELECTED_SECTOR, 194 QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SELECTED_SECTOR,
193 .flags = WIPHY_VENDOR_CMD_NEED_WDEV | 195 .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
194 WIPHY_VENDOR_CMD_NEED_RUNNING, 196 WIPHY_VENDOR_CMD_NEED_RUNNING,
197 .policy = wil_rf_sector_policy,
195 .doit = wil_rf_sector_get_selected 198 .doit = wil_rf_sector_get_selected
196 }, 199 },
197 { 200 {
@@ -200,6 +203,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
200 QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SELECTED_SECTOR, 203 QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SELECTED_SECTOR,
201 .flags = WIPHY_VENDOR_CMD_NEED_WDEV | 204 .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
202 WIPHY_VENDOR_CMD_NEED_RUNNING, 205 WIPHY_VENDOR_CMD_NEED_RUNNING,
206 .policy = wil_rf_sector_policy,
203 .doit = wil_rf_sector_set_selected 207 .doit = wil_rf_sector_set_selected
204 }, 208 },
205}; 209};
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
index f6500899fc14..d07e7c7355d9 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
@@ -112,6 +112,7 @@ const struct wiphy_vendor_command brcmf_vendor_cmds[] = {
112 }, 112 },
113 .flags = WIPHY_VENDOR_CMD_NEED_WDEV | 113 .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
114 WIPHY_VENDOR_CMD_NEED_NETDEV, 114 WIPHY_VENDOR_CMD_NEED_NETDEV,
115 .policy = VENDOR_CMD_RAW_DATA,
115 .doit = brcmf_cfg80211_vndr_cmds_dcmd_handler 116 .doit = brcmf_cfg80211_vndr_cmds_dcmd_handler
116 }, 117 },
117}; 118};
diff --git a/drivers/net/wireless/ti/wlcore/vendor_cmd.c b/drivers/net/wireless/ti/wlcore/vendor_cmd.c
index 5cf0b32c413b..e1bd344c4ebc 100644
--- a/drivers/net/wireless/ti/wlcore/vendor_cmd.c
+++ b/drivers/net/wireless/ti/wlcore/vendor_cmd.c
@@ -163,6 +163,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = {
163 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV | 163 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
164 WIPHY_VENDOR_CMD_NEED_RUNNING, 164 WIPHY_VENDOR_CMD_NEED_RUNNING,
165 .doit = wlcore_vendor_cmd_smart_config_start, 165 .doit = wlcore_vendor_cmd_smart_config_start,
166 .policy = wlcore_vendor_attr_policy,
166 }, 167 },
167 { 168 {
168 .info = { 169 .info = {
@@ -172,6 +173,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = {
172 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV | 173 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
173 WIPHY_VENDOR_CMD_NEED_RUNNING, 174 WIPHY_VENDOR_CMD_NEED_RUNNING,
174 .doit = wlcore_vendor_cmd_smart_config_stop, 175 .doit = wlcore_vendor_cmd_smart_config_stop,
176 .policy = wlcore_vendor_attr_policy,
175 }, 177 },
176 { 178 {
177 .info = { 179 .info = {
@@ -181,6 +183,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = {
181 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV | 183 .flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
182 WIPHY_VENDOR_CMD_NEED_RUNNING, 184 WIPHY_VENDOR_CMD_NEED_RUNNING,
183 .doit = wlcore_vendor_cmd_smart_config_set_group_key, 185 .doit = wlcore_vendor_cmd_smart_config_set_group_key,
186 .policy = wlcore_vendor_attr_policy,
184 }, 187 },
185}; 188};
186 189