From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk,
Karsten Wiese <fzu@wemgehoertderstaat.de>,
David Brownell <david-b@pacbell.net>
Subject: [patch 21/32] USB: EHCI: Fix isochronous URB leak
Date: Fri, 20 Mar 2009 15:26:32 -0700 [thread overview]
Message-ID: <20090320222712.293646809@mini.kroah.org> (raw)
In-Reply-To: <20090320231037.GA2732@kroah.com>
[-- Attachment #1: usb-ehci-fix-isochronous-urb-leak.patch --]
[-- Type: text/plain, Size: 2714 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Karsten Wiese <fzuuzf@googlemail.com>
commit 508db8c954d55ed30f870d2c24d741ba6269d13c upstream.
ehci-hcd uses usb_get_urb() and usb_put_urb() in an unbalanced way causing
isochronous URB's kref.counts incrementing once per usb_submit_urb() call.
The culprit is *usb being set to NULL when usb_put_urb() is called after URB
is given back.
Due to other fixes there is no need for ehci-hcd to deal with usb_get_urb()
nor usb_put_urb() anymore, so patch removes their usages in ehci-hcd.
Patch also makes ehci_to_hcd(ehci)->self.bandwidth_allocated adjust, if a
stream finishes.
Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/host/ehci-sched.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1536,7 +1536,7 @@ itd_link_urb (
struct ehci_itd, itd_list);
list_move_tail (&itd->itd_list, &stream->td_list);
itd->stream = iso_stream_get (stream);
- itd->urb = usb_get_urb (urb);
+ itd->urb = urb;
itd_init (ehci, stream, itd);
}
@@ -1645,7 +1645,7 @@ itd_complete (
(void) disable_periodic(ehci);
ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
- if (unlikely (list_empty (&stream->td_list))) {
+ if (unlikely(list_is_singular(&stream->td_list))) {
ehci_to_hcd(ehci)->self.bandwidth_allocated
-= stream->bandwidth;
ehci_vdbg (ehci,
@@ -1656,7 +1656,6 @@ itd_complete (
iso_stream_put (ehci, stream);
done:
- usb_put_urb(urb);
itd->urb = NULL;
if (ehci->clock_frame != itd->frame || itd->index[7] != -1) {
/* OK to recycle this ITD now. */
@@ -1949,7 +1948,7 @@ sitd_link_urb (
struct ehci_sitd, sitd_list);
list_move_tail (&sitd->sitd_list, &stream->td_list);
sitd->stream = iso_stream_get (stream);
- sitd->urb = usb_get_urb (urb);
+ sitd->urb = urb;
sitd_patch(ehci, stream, sitd, sched, packet);
sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size,
@@ -2034,7 +2033,7 @@ sitd_complete (
(void) disable_periodic(ehci);
ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
- if (list_empty (&stream->td_list)) {
+ if (list_is_singular(&stream->td_list)) {
ehci_to_hcd(ehci)->self.bandwidth_allocated
-= stream->bandwidth;
ehci_vdbg (ehci,
@@ -2045,7 +2044,6 @@ sitd_complete (
iso_stream_put (ehci, stream);
/* OK to recycle this SITD now that its completion callback ran. */
done:
- usb_put_urb(urb);
sitd->urb = NULL;
sitd->stream = NULL;
list_move(&sitd->sitd_list, &stream->free_list);
next prev parent reply other threads:[~2009-03-20 23:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090320222611.872315885@mini.kroah.org>
2009-03-20 23:10 ` [patch 00/32] 2.6.27.21-stable review Greg KH
2009-03-20 22:26 ` [patch 01/32] [IA64] Build fix for __early_pfn_to_nid() undefined link error Greg KH
2009-03-20 22:26 ` [patch 02/32] Add -fwrapv to gcc CFLAGS Greg KH
2009-03-20 22:26 ` [patch 03/32] Move cc-option to below arch-specific setup Greg KH
2009-03-20 22:26 ` [patch 04/32] nfsd: nfsd should drop CAP_MKNOD for non-root Greg KH
2009-03-20 22:26 ` [patch 05/32] NFSD: provide encode routine for OP_OPENATTR Greg KH
2009-03-20 22:26 ` [patch 06/32] ALSA: Fix vunmap and free order in snd_free_sgbuf_pages() Greg KH
2009-03-20 22:26 ` [patch 07/32] ALSA: hda - Fix DMA mask for ATI controllers Greg KH
2009-03-20 22:26 ` [patch 08/32] ALSA: mixart, fix lock imbalance Greg KH
2009-03-20 22:26 ` [patch 09/32] ALSA: pcm_oss, fix locking typo Greg KH
2009-03-20 22:26 ` [patch 10/32] ata_piix: add workaround for Samsung DB-P70 Greg KH
2009-03-20 22:26 ` [patch 11/32] dm crypt: fix kcryptd_async_done parameter Greg KH
2009-03-20 22:26 ` [patch 12/32] dm ioctl: validate name length when renaming Greg KH
2009-03-20 22:26 ` [patch 13/32] dm io: respect BIO_MAX_PAGES limit Greg KH
2009-03-20 22:26 ` [patch 14/32] eventfd: remove fput() call from possible IRQ context Greg KH
2009-03-20 22:26 ` [patch 15/32] S390: __div64_31 broken for CONFIG_MARCH_G5 Greg KH
2009-03-20 22:26 ` [patch 16/32] thinkpad-acpi: fix module autoloading for older models Greg KH
2009-03-20 22:26 ` [patch 17/32] V4L/DVB (10218): cx23885: Fix Oops for mixed install of analog and digital only cards Greg KH
2009-03-20 22:26 ` [patch 18/32] Fix misreporting of #cores as #hyperthreads for Q9550 Greg KH
2009-03-20 22:26 ` [patch 19/32] powerpc: Remove extra semicolon in fsl_soc.c Greg KH
2009-03-20 22:26 ` [patch 20/32] USB: EHCI: expedite unlinks when the root hub is suspended Greg KH
2009-03-20 22:26 ` Greg KH [this message]
2009-03-20 22:26 ` [patch 22/32] USB: Add Vendor/Product ID for new CDMA U727 to option driver Greg KH
2009-03-20 22:26 ` [patch 23/32] USB: option.c: add ZTE 622 modem device Greg KH
2009-03-20 22:26 ` [patch 24/32] USB: Add device id for Option GTM380 to option driver Greg KH
2009-03-20 22:26 ` [patch 25/32] USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530 Greg KH
2009-03-20 22:26 ` [patch 26/32] USB: serial: add FTDI USB/Serial converter devices Greg KH
2009-03-20 22:26 ` [patch 27/32] USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0 Greg KH
2009-03-20 22:26 ` [patch 28/32] USB: serial: new cp2101 device id Greg KH
2009-03-20 22:26 ` [patch 29/32] USB: storage: Unusual USB device Prolific 2507 variation added Greg KH
2009-03-20 22:26 ` [patch 30/32] USB: unusual_devs: Add support for GI 0431 SD-Card interface Greg KH
2009-03-20 22:26 ` [patch 31/32] USB: Updated unusual-devs entry for USB mass storage on Nokia 6233 Greg KH
2009-03-20 22:26 ` [patch 32/32] USB: usbfs: keep async URBs until the device file is closed Greg KH
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=20090320222712.293646809@mini.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=david-b@pacbell.net \
--cc=eteo@redhat.com \
--cc=fzu@wemgehoertderstaat.de \
--cc=jake@lwn.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/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).