]> git.itanic.dy.fi Git - linux-stable/commitdiff
staging: rtl8712: fix race condition
authorNam Cao <namcaov@gmail.com>
Mon, 31 Jul 2023 11:06:20 +0000 (13:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Sep 2023 20:28:39 +0000 (21:28 +0100)
commit 1422b526fba994cf05fd288a152106563b875fce upstream.

In probe function, request_firmware_nowait() is called to load firmware
asynchronously. At completion of firmware loading, register_netdev() is
called. However, a mutex needed by netdev is initialized after the call
to request_firmware_nowait(). Consequently, it can happen that
register_netdev() is called before the driver is ready.

Move the mutex initialization into r8712_init_drv_sw(), which is called
before request_firmware_nowait().

Reported-by: syzbot+b08315e8cf5a78eed03c@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/linux-staging/000000000000d9d4560601b8e0d7@google.com/T/#u
Fixes: 8c213fa59199 ("staging: r8712u: Use asynchronous firmware loading")
Cc: stable <stable@kernel.org>
Signed-off-by: Nam Cao <namcaov@gmail.com>
Link: https://lore.kernel.org/r/20230731110620.116562-1-namcaov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/os_intfs.c
drivers/staging/rtl8712/usb_intf.c

index bc033849fcea377b69985f169adeba615d8cc1ab..2a4c6cf14facc8efbefdd914bb5a5d53841a5561 100644 (file)
@@ -323,6 +323,7 @@ int r8712_init_drv_sw(struct _adapter *padapter)
        mp871xinit(padapter);
        init_default_value(padapter);
        r8712_InitSwLeds(padapter);
+       mutex_init(&padapter->mutex_start);
        return ret;
 }
 
index 6db2493e6d3acc79f9f50135816d21e7bd3a58a9..ed8e70cce68bf74cb981af993e3cc71ec28844e7 100644 (file)
@@ -567,7 +567,6 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
        if (rtl871x_load_fw(padapter))
                goto deinit_drv_sw;
        spin_lock_init(&padapter->lock_rx_ff0_filter);
-       mutex_init(&padapter->mutex_start);
        return 0;
 
 deinit_drv_sw: