]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
xhci-mem.c: Check for ring->first_seg != NULL
authorKautuk Consul <consul.kautuk@gmail.com>
Mon, 19 Sep 2011 23:53:12 +0000 (16:53 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:15 +0000 (12:32 -0800)
commit811198dd14bc3f53f016ffba89b04eb360bcab14
tree45d67c1088bd0da2dd0fd9aed23ea6116c73be22
parent777fd194cb634f5430695c9638585e5e90785b27
xhci-mem.c: Check for ring->first_seg != NULL

commit 0e6c7f746ea99089fb3263709075c20485a479ae upstream.

There are 2 situations wherein the xhci_ring* might not get freed:
- When xhci_ring_alloc() -> xhci_segment_alloc() returns NULL and
  we goto the fail: label in xhci_ring_alloc. In this case, the ring
  will not get kfreed.
- When the num_segs argument to xhci_ring_alloc is passed as 0 and
  we try to free the rung after that.
  ( This doesn't really happen as of now in the code but we seem to
    be entertaining num_segs=0 in xhci_ring_alloc )

This should be backported to kernels as old as 2.6.31.

Signed-off-by: Kautuk Consul <consul.kautuk@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/xhci-mem.c