diff options
| author | Francesco Lavra <francescolavra@interfree.it> | 2009-12-31 06:47:11 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 19:01:18 -0400 |
| commit | 5cf5162132697541fe4de1290afaea4ed841473d (patch) | |
| tree | f58168c0736542879627f160cffdcd501883cbe8 /drivers | |
| parent | 6afa5c708e7f6acf6fe5e47262a6e2c95d2deaa3 (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.c | 1 |
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 cc0505eb900f..6b0a4953ab0e 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
| @@ -606,6 +606,7 @@ static int dvb_fini(struct em28xx *dev) | |||
| 606 | 606 | ||
| 607 | if (dev->dvb) { | 607 | if (dev->dvb) { |
| 608 | unregister_dvb(dev->dvb); | 608 | unregister_dvb(dev->dvb); |
| 609 | kfree(dev->dvb); | ||
| 609 | dev->dvb = NULL; | 610 | dev->dvb = NULL; |
| 610 | } | 611 | } |
| 611 | 612 | ||