summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFrancesco Lavra <francescolavra@interfree.it>2009-12-31 08:47:11 -0300
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 15:52:27 -0700
commit8314375b8f9447e74221ad2116121ca40cbfc1bb (patch)
tree81b05908e5229e8473483d0c1b250fa72b1e6d90 /drivers
parent9776e39de376c2dd759f1d8d7f568111139b330e (diff)
V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()
commit 19f48cb105b7fa18d0dcab435919a3a29b7a7c4c upstream. this patch fixes a memory leak which occurs when an em28xx card with DVB extension is unplugged or its DVB extension driver is unloaded. In dvb_fini(), dev->dvb must be freed before being set to NULL, as is done in dvb_init() in case of error. Note that this bug is also present in the latest stable kernel release. Signed-off-by: Francesco Lavra <francescolavra@interfree.it> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d2b1a1a52689..72894f408517 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -501,6 +501,7 @@ static int dvb_fini(struct em28xx *dev)
if (dev->dvb) {
unregister_dvb(dev->dvb);
+ kfree(dev->dvb);
dev->dvb = NULL;
}