diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-01-28 18:35:26 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-01-28 19:10:48 +0100 |
| commit | bae173563cbf469533d0c38534b874d4a2df0c85 (patch) | |
| tree | 11b88effdc0002ed21a09b2e24f2164381b5a335 /net/wireless | |
| parent | nl80211: call cfg80211_dev_rename() under RTNL (diff) | |
| download | linux-bae173563cbf469533d0c38534b874d4a2df0c85.tar.xz linux-bae173563cbf469533d0c38534b874d4a2df0c85.zip | |
wext: call cfg80211_change_iface() with wiphy lock held
This is needed now that all the driver callbacks are protected by
the wiphy lock rather than (just) the RTNL.
Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
Reported-by: syzbot+d2d412349f88521938aa@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/20210128183454.e81bc6789b4b.I5deb8b6bfdc8b4ea7696cb2447ee6c58c7ce9a4e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/wext-compat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2e35cb78221e..0c6ea6212496 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -39,6 +39,7 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info, struct cfg80211_registered_device *rdev; struct vif_params vifparams; enum nl80211_iftype type; + int ret; rdev = wiphy_to_rdev(wdev->wiphy); @@ -61,7 +62,11 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info, memset(&vifparams, 0, sizeof(vifparams)); - return cfg80211_change_iface(rdev, dev, type, &vifparams); + wiphy_lock(wdev->wiphy); + ret = cfg80211_change_iface(rdev, dev, type, &vifparams); + wiphy_unlock(wdev->wiphy); + + return ret; } EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode); |