Re: [PATCH] staging: rtl8712: Fix memory leak in r8712_init_recv_priv

慕冬亮
2021-05-21T12:10:23Z

On Fri, May 21, 2021 at 8:08 PM Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>
> r871xu_dev_remove failed to call r8712_free_drv_sw() and free the
> resource (e.g., struct urb) due to the failure of firmware loading.
>
> Fix this by invoking r8712_free_drv_sw at the failure site.
>
> Reported-by: syzbot+1c46f3771695bccbdb3a@syzkaller.appspotmail.com
> Fixes: b4383c971bc5 ("staging: rtl8712: handle firmware load failure")
> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
> ---
> drivers/staging/rtl8712/usb_intf.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
> index dc21e7743349..a5190b4250ce 100644
> --- a/drivers/staging/rtl8712/usb_intf.c
> +++ b/drivers/staging/rtl8712/usb_intf.c
> @@ -589,7 +589,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
> */
> static void r871xu_dev_remove(struct usb_interface *pusb_intf)
> {
> - struct net_device *pnetdev = usb_get_intfdata(pusb_intf);
> + struct net_device *pnetdev, *newpnetdev = usb_get_intfdata(pusb_intf);
> struct usb_device *udev = interface_to_usbdev(pusb_intf);
>
> if (pnetdev) {
> @@ -597,9 +597,9 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
>
> /* never exit with a firmware callback pending */
> wait_for_completion(&padapter->rtl8712_fw_ready);
> - pnetdev = usb_get_intfdata(pusb_intf);
> + newpnetdev = usb_get_intfdata(pusb_intf);
> usb_set_intfdata(pusb_intf, NULL);
> - if (!pnetdev)
> + if (!newpnetdev)
> goto firmware_load_fail;
> release_firmware(padapter->fw);
> if (drvpriv.drv_registered)
> @@ -625,6 +625,13 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
> */
> if (udev->state != USB_STATE_NOTATTACHED)
> usb_reset_device(udev);
> + if (pnetdev) {
> + struct _adapter *padapter = netdev_priv(pnetdev);
> + /* Stop driver mlme relation timer */
> + //r8712_stop_drv_timers(padapter);
> + //r871x_dev_unload(padapter);

I am not sure if I should add those deallocation functions in this
branch. I will appreciate it if anyone can give some advice here.

> + r8712_free_drv_sw(padapter);
> + }
> }
>
> static int __init r8712u_drv_entry(void)
> --
> 2.25.1
>