From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Michael Schenk <michael.schenk@albis-elcon.com>,
Larry Finger <Larry.Finger@lwfinger.net>,
Kalle Valo <kvalo@codeaurora.org>
Subject: [PATCH 4.4 24/25] rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down
Date: Fri, 24 Feb 2017 09:25:36 +0100 [thread overview]
Message-ID: <20170224082131.568096598@linuxfoundation.org> (raw)
In-Reply-To: <20170224082128.156304123@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Schenk <michael.schenk@albis-elcon.com>
commit 575ddce0507789bf9830d089557d2199d2f91865 upstream.
In the function rtl_usb_start we pre-allocate a certain number of urbs
for RX path but they will not be freed when calling rtl_usb_stop. This
results in leaking urbs when doing ifconfig up and down. Eventually,
the system has no available urbs.
Signed-off-by: Michael Schenk <michael.schenk@albis-elcon.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/realtek/rtlwifi/usb.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -834,12 +834,30 @@ static void rtl_usb_stop(struct ieee8021
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
+ struct urb *urb;
/* should after adapter start and interrupt enable. */
set_hal_stop(rtlhal);
cancel_work_sync(&rtlpriv->works.fill_h2c_cmd);
/* Enable software */
SET_USB_STOP(rtlusb);
+
+ /* free pre-allocated URBs from rtl_usb_start() */
+ usb_kill_anchored_urbs(&rtlusb->rx_submitted);
+
+ tasklet_kill(&rtlusb->rx_work_tasklet);
+ cancel_work_sync(&rtlpriv->works.lps_change_work);
+
+ flush_workqueue(rtlpriv->works.rtl_wq);
+
+ skb_queue_purge(&rtlusb->rx_queue);
+
+ while ((urb = usb_get_from_anchor(&rtlusb->rx_cleanup_urbs))) {
+ usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+ urb->transfer_buffer, urb->transfer_dma);
+ usb_free_urb(urb);
+ }
+
rtlpriv->cfg->ops->hw_disable(hw);
}
next prev parent reply other threads:[~2017-02-24 8:29 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 8:25 [PATCH 4.4 00/25] 4.4.52-stable review Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 01/25] rtlwifi: rtl_usb: Fix missing entry in USB drivers private data Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 02/25] rtc: interface: ignore expired timers when enqueuing new timers Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 03/25] blk-mq: really fix plug list flushing for nomerge queues Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 04/25] net/llc: avoid BUG_ON() in skb_orphan() Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 05/25] packet: fix races in fanout_add() Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 06/25] packet: Do not call fanout_release from atomic contexts Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 07/25] dccp: fix freeing skb too early for IPV6_RECVPKTINFO Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 08/25] irda: Fix lockdep annotations in hashbin_delete() Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 09/25] ip: fix IP_CHECKSUM handling Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 10/25] net: socket: fix recvmmsg not returning error from sock_error Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 11/25] tty: serial: msm: Fix module autoload Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 12/25] USB: serial: mos7840: fix another NULL-deref at open Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 13/25] USB: serial: cp210x: add new IDs for GE Bx50v3 boards Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 14/25] USB: serial: ftdi_sio: fix modem-status error handling Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 15/25] USB: serial: ftdi_sio: fix extreme low-latency setting Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 16/25] USB: serial: ftdi_sio: fix line-status over-reporting Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 17/25] USB: serial: digi_acceleport: fix OOB data sanity check Greg Kroah-Hartman
2017-02-24 13:38 ` Ben Hutchings
2017-02-24 17:33 ` Johan Hovold
2017-02-24 17:55 ` Greg Kroah-Hartman
2017-02-24 18:13 ` Johan Hovold
2017-03-13 17:14 ` Johan Hovold
2017-03-15 7:16 ` Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 18/25] USB: serial: spcp8x5: fix modem-status handling Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 19/25] USB: serial: opticon: fix CTS retrieval at open Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 20/25] USB: serial: ark3116: fix register-accessor error handling Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 21/25] x86/platform/goldfish: Prevent unconditional loading Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 22/25] goldfish: Sanitize the broken interrupt handler Greg Kroah-Hartman
2017-02-24 8:25 ` [PATCH 4.4 23/25] block: fix double-free in the failure path of cgwb_bdi_init() Greg Kroah-Hartman
2017-02-24 8:25 ` Greg Kroah-Hartman [this message]
2017-02-24 8:25 ` [PATCH 4.4 25/25] Revert "usb: chipidea: imx: enable CI_HDRC_SET_NON_ZERO_TTHA" Greg Kroah-Hartman
2017-02-24 13:55 ` [PATCH 4.4 00/25] 4.4.52-stable review Ben Hutchings
2017-02-24 14:43 ` Greg Kroah-Hartman
2017-02-24 15:31 ` David Miller
2017-02-24 15:41 ` Greg Kroah-Hartman
2017-02-24 16:30 ` Ben Hutchings
2017-02-24 16:22 ` Guenter Roeck
2017-02-24 18:15 ` Shuah Khan
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=20170224082131.568096598@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Larry.Finger@lwfinger.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.schenk@albis-elcon.com \
--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