Skip to content

Commit

Permalink
wext: call cfg80211_set_encryption() with wiphy lock held
Browse files Browse the repository at this point in the history
Similar to the previous commit, we need to hold the wiphy lock
here. There's a second instance that is correct already, fix
this one as well.

Fixes: a05829a ("cfg80211: avoid holding the RTNL when calling the driver")
Link: https://lore.kernel.org/r/20210128183454.ea2f086465ed.I891d3bb44f068e6d97c160005010f052f28ab6e5@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jan 28, 2021
1 parent bae1735 commit c88f952
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion net/wireless/wext-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
bool remove = false;
struct key_params params;
u32 cipher;
int ret;

if (wdev->iftype != NL80211_IFTYPE_STATION &&
wdev->iftype != NL80211_IFTYPE_ADHOC)
Expand Down Expand Up @@ -726,12 +727,16 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
params.seq_len = 6;
}

return cfg80211_set_encryption(
wiphy_lock(wdev->wiphy);
ret = cfg80211_set_encryption(
rdev, dev,
!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY),
addr, remove,
ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY,
idx, &params);
wiphy_unlock(wdev->wiphy);

return ret;
}

static int cfg80211_wext_giwencode(struct net_device *dev,
Expand Down

0 comments on commit c88f952

Please sign in to comment.