]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtl8188eu: Fix a possible sleep-in-atomic bug in set_tx_beacon_cmd
authorJia-Ju Bai <baijiaju1990@gmail.com>
Tue, 12 Dec 2017 13:08:06 +0000 (21:08 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Dec 2017 11:48:46 +0000 (12:48 +0100)
The driver may sleep under a spinlock.
The function call path is:
update_beacon (acquire the spinlock)
  update_BCNTIM
    set_tx_beacon_cmd
      kzalloc(GFP_KERNEL) --> may sleep
      kmemdup(GFP_KERNEL) --> may sleep

To fix it, GFP_KERNEL is replaced with GFP_ATOMIC.

This bug is found by my static analysis tool(DSAC) and checked by my code review.

Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

index d73e9bdc80cc28c80382181016ef1ca375f0279f..bcb6919bb7d502a8e3fdda52b647254993be7b67 100644 (file)
@@ -5395,14 +5395,14 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
        int len_diff = 0;
 
 
-       ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
+       ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        ptxBeacon_parm = kmemdup(&(pmlmeinfo->network),
-                               sizeof(struct wlan_bssid_ex), GFP_KERNEL);
+                               sizeof(struct wlan_bssid_ex), GFP_ATOMIC);
        if (ptxBeacon_parm == NULL) {
                kfree(ph2c);
                res = _FAIL;