From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Chris Chiu <chiu@endlessm.com>, Kalle Valo <kvalo@codeaurora.org>,
Sasha Levin <sashal@kernel.org>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 26/33] rtl8xxxu: prevent potential memory leak
Date: Sun, 18 Oct 2020 15:27:21 -0400 [thread overview]
Message-ID: <20201018192728.4056577-26-sashal@kernel.org> (raw)
In-Reply-To: <20201018192728.4056577-1-sashal@kernel.org>
From: Chris Chiu <chiu@endlessm.com>
[ Upstream commit 86279456a4d47782398d3cb8193f78f672e36cac ]
Free the skb if usb_submit_urb fails on rx_urb. And free the urb
no matter usb_submit_urb succeeds or not in rtl8xxxu_submit_int_urb.
Signed-off-by: Chris Chiu <chiu@endlessm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200906040424.22022-1-chiu@endlessm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 8254d4b22c50b..b8d387edde65c 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -5135,7 +5135,6 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw)
ret = usb_submit_urb(urb, GFP_KERNEL);
if (ret) {
usb_unanchor_urb(urb);
- usb_free_urb(urb);
goto error;
}
@@ -5144,6 +5143,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw)
rtl8xxxu_write32(priv, REG_USB_HIMR, val32);
error:
+ usb_free_urb(urb);
return ret;
}
@@ -5424,6 +5424,7 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)
struct rtl8xxxu_priv *priv = hw->priv;
struct rtl8xxxu_rx_urb *rx_urb;
struct rtl8xxxu_tx_urb *tx_urb;
+ struct sk_buff *skb;
unsigned long flags;
int ret, i;
@@ -5472,6 +5473,13 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)
rx_urb->hw = hw;
ret = rtl8xxxu_submit_rx_urb(priv, rx_urb);
+ if (ret) {
+ if (ret != -ENOMEM) {
+ skb = (struct sk_buff *)rx_urb->urb.context;
+ dev_kfree_skb(skb);
+ }
+ rtl8xxxu_queue_rx_urb(priv, rx_urb);
+ }
}
exit:
/*
--
2.25.1
next prev parent reply other threads:[~2020-10-18 19:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-18 19:26 [PATCH AUTOSEL 4.4 01/33] media: firewire: fix memory leak Sasha Levin
2020-10-18 19:26 ` [PATCH AUTOSEL 4.4 02/33] media: ati_remote: sanity check for both endpoints Sasha Levin
2020-10-18 19:26 ` [PATCH AUTOSEL 4.4 03/33] media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync Sasha Levin
2020-10-18 19:26 ` [PATCH AUTOSEL 4.4 04/33] media: exynos4-is: Fix a reference count leak " Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 05/33] media: exynos4-is: Fix a reference count leak Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 06/33] media: bdisp: Fix runtime PM imbalance on error Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 07/33] media: media/pci: prevent memory leak in bttv_probe Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 08/33] media: uvcvideo: Ensure all probed info is returned to v4l2 Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 09/33] mmc: sdio: Check for CISTPL_VERS_1 buffer size Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 10/33] media: saa7134: avoid a shift overflow Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 11/33] ntfs: add check for mft record size in superblock Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 12/33] PM: hibernate: remove the bogus call to get_gendisk() in software_resume() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 13/33] scsi: mvumi: Fix error return in mvumi_io_attach() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 14/33] scsi: target: core: Add CONTROL field for trace events Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 15/33] usb: gadget: function: printer: fix use-after-free in __lock_acquire Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 16/33] udf: Limit sparing table size Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 17/33] udf: Avoid accessing uninitialized data on failed inode read Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 18/33] ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 19/33] misc: rtsx: Fix memory leak in rtsx_pci_probe Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 20/33] reiserfs: only call unlock_new_inode() if I_NEW Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 21/33] xfs: make sure the rt allocator doesn't run off the end Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 22/33] usb: ohci: Default to per-port over-current protection Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 23/33] Bluetooth: Only mark socket zapped after unlocking Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 24/33] scsi: ibmvfc: Fix error return in ibmvfc_probe() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 25/33] brcmsmac: fix memory leak in wlc_phy_attach_lcnphy Sasha Levin
2020-10-18 19:27 ` Sasha Levin [this message]
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 27/33] Fix use after free in get_capset_info callback Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 28/33] tty: ipwireless: fix error handling Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 29/33] ipvs: Fix uninit-value in do_ip_vs_set_ctl() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 30/33] reiserfs: Fix memory leak in reiserfs_parse_options() Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 31/33] brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 32/33] usb: core: Solve race condition in anchor cleanup functions Sasha Levin
2020-10-18 19:27 ` [PATCH AUTOSEL 4.4 33/33] ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n() 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=20201018192728.4056577-26-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=chiu@endlessm.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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