3.2.94-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Johan Hovold <jo...@kernel.org> commit 2d5a6ce71c72d98d4f7948672842e3e8c265a8b7 upstream. Fix urb and transfer-buffer leaks in an urb-submission error path which may be hit when a device is disconnected. Fixes: 66e89522aff7 ("V4L/DVB: IR: add mceusb IR receiver driver") Cc: Jarod Wilson <ja...@redhat.com> Signed-off-by: Johan Hovold <jo...@kernel.org> Signed-off-by: Sean Young <s...@mess.org> Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com> [bwh: Backported to 3.2: - Add check on urb_type, as async_buf and async_urb aren't always allocated - Adjust context] Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -739,6 +739,7 @@ static void mce_request_packet(struct mc } else if (urb_type == MCEUSB_RX) { /* standard request */ async_urb = ir->urb_in; + async_buf = NULL; ir->send_flags = RECV_FLAG_IN_PROGRESS; } else { @@ -754,6 +755,10 @@ static void mce_request_packet(struct mc res = usb_submit_urb(async_urb, GFP_ATOMIC); if (res) { mce_dbg(dev, "receive request FAILED! (res=%d)\n", res); + if (urb_type == MCEUSB_TX) { + kfree(async_buf); + usb_free_urb(async_urb); + } return; } mce_dbg(dev, "receive request complete (res=%d)\n", res);