Reported by kmemleak.
Signed-off-by: Jean Delvare <kh...@linux-fr.org>
Cc: Mauro Carvalho Chehab <mche...@infradead.org>
Cc: Devin Heitmueller <dheitmuel...@kernellabs.com>
---
Changes since v1:
* Don't free the URB when it is still in use.
* Fix a second leak (transfer_buffer).
drivers/media/dvb/dvb-usb/dib0700_core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- linux-3.3-rc7.orig/drivers/media/dvb/dvb-usb/dib0700_core.c 2012-03-13
11:20:33.748864483 +0100
+++ linux-3.3-rc7/drivers/media/dvb/dvb-usb/dib0700_core.c 2012-03-13
17:42:20.316570058 +0100
@@ -679,6 +679,7 @@ static void dib0700_rc_urb_completion(st
deb_info("%s()\n", __func__);
if (d->rc_dev == NULL) {
/* This will occur if disable_rc_polling=1 */
+ kfree(purb->transfer_buffer);
usb_free_urb(purb);
return;
}
@@ -687,6 +688,7 @@ static void dib0700_rc_urb_completion(st
if (purb->status < 0) {
deb_info("discontinuing polling\n");
+ kfree(purb->transfer_buffer);
usb_free_urb(purb);
return;
}
@@ -781,8 +783,11 @@ int dib0700_rc_setup(struct dvb_usb_devi
dib0700_rc_urb_completion, d);
ret = usb_submit_urb(purb, GFP_ATOMIC);
- if (ret)
+ if (ret) {
err("rc submit urb failed\n");
+ kfree(purb->transfer_buffer);
+ usb_free_urb(purb);
+ }
return ret;
}
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
