From: Philipp Hortmann Date: Tue, 16 May 2023 19:22:06 +0000 (+0200) Subject: staging: rtl8192e: Unlock wx_mutex not in rtllib_wx_set_scan X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2305232c94d2fcefa9e26ba68af73586508ba555;p=linux.git staging: rtl8192e: Unlock wx_mutex not in rtllib_wx_set_scan On start of rtllib_wx_set_scan lock was taken with mutex_lock(&ieee->wx_mutex). Unlocking was done at the end of schedule_work(&ieee->wx_sync_scan_wq) which lead to the error "lock held when returning to user space!". Pushing lock to beginning of ieee->wx_sync_scan_wq to improve overview. Removed lock from rtllib_wx_set_scan as ieee->state, ieee->iw_mode and ieee->proto_started are not protected in many other places. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/20230516192206.GA7710@matrix-ESPRIMO-P710 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 371864f0087f5..e93da95f175b3 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -332,6 +332,7 @@ void rtllib_wx_sync_scan_wq(void *data) enum ht_channel_width bandwidth = 0; int b40M = 0; + mutex_lock(&ieee->wx_mutex); if (!(ieee->softmac_features & IEEE_SOFTMAC_SCAN)) { rtllib_start_scan_syncro(ieee, 0); goto out; @@ -404,8 +405,6 @@ int rtllib_wx_set_scan(struct rtllib_device *ieee, struct iw_request_info *a, { int ret = 0; - mutex_lock(&ieee->wx_mutex); - if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)) { ret = -1; goto out; @@ -418,7 +417,6 @@ int rtllib_wx_set_scan(struct rtllib_device *ieee, struct iw_request_info *a, } out: - mutex_unlock(&ieee->wx_mutex); return ret; } EXPORT_SYMBOL(rtllib_wx_set_scan);