stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Xiaoke Wang <xkernel.wang@foxmail.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>,
	Larry.Finger@lwfinger.net, florian.c.schilhabel@googlemail.com,
	kuba@kernel.org, paskripkin@gmail.com, len.baker@gmx.com,
	fmdefrancesco@gmail.com, skumark1902@gmail.com,
	wanngchenng@gmail.com, linux-staging@lists.linux.dev
Subject: [PATCH AUTOSEL 5.17 02/60] staging: rtl8712: fix a potential memory leak in r871xu_drv_init()
Date: Tue,  7 Jun 2022 13:51:59 -0400	[thread overview]
Message-ID: <20220607175259.478835-2-sashal@kernel.org> (raw)
In-Reply-To: <20220607175259.478835-1-sashal@kernel.org>

From: Xiaoke Wang <xkernel.wang@foxmail.com>

[ Upstream commit 7288ff561de650d4139fab80e9cb0da9b5b32434 ]

In r871xu_drv_init(), if r8712_init_drv_sw() fails, then the memory
allocated by r8712_alloc_io_queue() in r8712_usb_dvobj_init() is not
properly released as there is no action will be performed by
r8712_usb_dvobj_deinit().
To properly release it, we should call r8712_free_io_queue() in
r8712_usb_dvobj_deinit().

Besides, in r871xu_dev_remove(), r8712_usb_dvobj_deinit() will be called
by r871x_dev_unload() under condition `padapter->bup` and
r8712_free_io_queue() is called by r8712_free_drv_sw().
However, r8712_usb_dvobj_deinit() does not rely on `padapter->bup` and
calling r8712_free_io_queue() in r8712_free_drv_sw() is negative for
better understading the code.
So I move r8712_usb_dvobj_deinit() into r871xu_dev_remove(), and remove
r8712_free_io_queue() from r8712_free_drv_sw().

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_B8048C592777830380A23A7C4409F9DF1305@qq.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/staging/rtl8712/os_intfs.c | 1 -
 drivers/staging/rtl8712/usb_intf.c | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index d15d52c0d1a7..003e97205124 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -332,7 +332,6 @@ void r8712_free_drv_sw(struct _adapter *padapter)
 	r8712_free_evt_priv(&padapter->evtpriv);
 	r8712_DeInitSwLeds(padapter);
 	r8712_free_mlme_priv(&padapter->mlmepriv);
-	r8712_free_io_queue(padapter);
 	_free_xmit_priv(&padapter->xmitpriv);
 	_r8712_free_sta_priv(&padapter->stapriv);
 	_r8712_free_recv_priv(&padapter->recvpriv);
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index ee4c61f85a07..56450ede9f23 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -265,6 +265,7 @@ static uint r8712_usb_dvobj_init(struct _adapter *padapter)
 
 static void r8712_usb_dvobj_deinit(struct _adapter *padapter)
 {
+	r8712_free_io_queue(padapter);
 }
 
 void rtl871x_intf_stop(struct _adapter *padapter)
@@ -302,9 +303,6 @@ void r871x_dev_unload(struct _adapter *padapter)
 			rtl8712_hal_deinit(padapter);
 		}
 
-		/*s6.*/
-		if (padapter->dvobj_deinit)
-			padapter->dvobj_deinit(padapter);
 		padapter->bup = false;
 	}
 }
@@ -607,6 +605,8 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
 	/* Stop driver mlme relation timer */
 	r8712_stop_drv_timers(padapter);
 	r871x_dev_unload(padapter);
+	if (padapter->dvobj_deinit)
+		padapter->dvobj_deinit(padapter);
 	r8712_free_drv_sw(padapter);
 	free_netdev(pnetdev);
 
-- 
2.35.1


  reply	other threads:[~2022-06-07 18:22 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-07 17:51 [PATCH AUTOSEL 5.17 01/60] iio: dummy: iio_simple_dummy: check the return value of kstrdup() Sasha Levin
2022-06-07 17:51 ` Sasha Levin [this message]
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 03/60] iio: st_sensors: Add a local lock for protecting odr Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 04/60] lkdtm/usercopy: Expand size of "out of frame" object Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 05/60] drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 06/60] drivers: staging: rtl8192bs: Fix deadlock in rtw_joinbss_event_prehandle() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 07/60] tty: synclink_gt: Fix null-pointer-dereference in slgt_clean() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 08/60] tty: Fix a possible resource leak in icom_probe Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 09/60] thunderbolt: Use different lane for second DisplayPort tunnel Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 10/60] drivers: staging: rtl8192u: Fix deadlock in ieee80211_beacons_stop() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 11/60] drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 12/60] USB: host: isp116x: check return value after calling platform_get_resource() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 13/60] drivers: tty: serial: Fix deadlock in sa1100_set_termios() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 14/60] drivers: usb: host: Fix deadlock in oxu_bus_suspend() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 15/60] USB: hcd-pci: Fully suspend across freeze/thaw cycle Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 16/60] char: xillybus: fix a refcount leak in cleanup_dev() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 17/60] sysrq: do not omit current cpu when showing backtrace of all active CPUs Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 18/60] usb: dwc2: gadget: don't reset gadget's driver->bus Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 19/60] usb: dwc3: host: Stop setting the ACPI companion Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 20/60] soundwire: qcom: adjust autoenumeration timeout Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 21/60] misc: rtsx: set NULL intfdata when probe fails Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 22/60] extcon: Fix extcon_get_extcon_dev() error handling Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 23/60] extcon: Modify extcon device to be created after driver data is set Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 24/60] clocksource/drivers/sp804: Avoid error on multiple instances Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 25/60] staging: rtl8723bs: Fix alignment to match open parenthesis Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 26/60] staging: rtl8712: fix uninit-value in usb_read8() and friends Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 27/60] staging: rtl8712: fix uninit-value in r871xu_drv_init() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 28/60] serial: msm_serial: disable interrupts in __msm_console_write() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 29/60] accessiblity: speakup: Add missing misc_deregister in softsynth_probe Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 30/60] kernfs: Separate kernfs_pr_cont_buf and rename_lock Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 31/60] watchdog: wdat_wdt: Stop watchdog when rebooting the system Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 32/60] ksmbd: smbd: fix connection dropped issue Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 33/60] md: don't unregister sync_thread with reconfig_mutex held Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 34/60] md: protect md_unregister_thread from reentrancy Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 35/60] scsi: myrb: Fix up null pointer access on myrb_cleanup() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 36/60] ASoC: rt5640: Do not manipulate pin "Platform Clock" if the "Platform Clock" is not in the DAPM Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 37/60] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 38/60] ceph: allow ceph.dir.rctime xattr to be updatable Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 39/60] ceph: flush the mdlog for filesystem sync Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 40/60] net, neigh: Set lower cap for neigh_managed_work rearming Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 41/60] drm/amd/display: Check if modulo is 0 before dividing Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 42/60] drm/radeon: fix a possible null pointer dereference Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 43/60] drm/amd/pm: fix a potential gpu_metrics_table memory leak Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 44/60] drm/amd/pm: Fix missing thermal throttler status Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 45/60] um: line: Use separate IRQs per line Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 46/60] modpost: fix undefined behavior of is_arm_mapping_symbol() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 47/60] x86/cpu: Elide KCSAN for cpu_has() and friends Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 48/60] jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 49/60] nbd: call genl_unregister_family() first in nbd_cleanup() Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 50/60] nbd: fix race between nbd_alloc_config() and module removal Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 51/60] nbd: fix io hung while disconnecting device Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 52/60] fs/ntfs3: Fix invalid free in log_replay Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 53/60] Revert "PCI: brcmstb: Do not turn off WOL regulators on suspend" Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 54/60] Revert "PCI: brcmstb: Add control of subdevice voltage regulators" Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 55/60] Revert "PCI: brcmstb: Add mechanism to turn on subdev regulators" Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 56/60] Revert "PCI: brcmstb: Split brcm_pcie_setup() into two funcs" Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 57/60] s390/gmap: voluntarily schedule during key setting Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 58/60] cifs: version operations for smb20 unneeded when legacy support disabled Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 59/60] drm/amd/pm: use bitmap_{from,to}_arr32 where appropriate Sasha Levin
2022-06-07 17:52 ` [PATCH AUTOSEL 5.17 60/60] nodemask: Fix return values to be unsigned Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220607175259.478835-2-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=Larry.Finger@lwfinger.net \
    --cc=dan.carpenter@oracle.com \
    --cc=florian.c.schilhabel@googlemail.com \
    --cc=fmdefrancesco@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kuba@kernel.org \
    --cc=len.baker@gmx.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=paskripkin@gmail.com \
    --cc=skumark1902@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=wanngchenng@gmail.com \
    --cc=xkernel.wang@foxmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).