aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2009-04-14 19:51:30 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-29 15:41:12 -0300
commit9401608bb34be14960311dbb91d4a82ee07a03fa (patch)
treef5dc37faf89d24b659a659e057d7f8457a4178e6
parent5b83cfa98569663b6fa6cda85a1f2fd371a082c7 (diff)
downloadlinux-2.6.34-ux500-9401608bb34be14960311dbb91d4a82ee07a03fa.tar.gz
V4L/DVB (11516): drivers/media/video/saa5246a.c: fix use-after-free
I lowered the kfree(t) down a couple lines and removed the superflous "t->vdev = NULL;" Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/saa5246a.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index da47b2f0528..155804b061e 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -1092,9 +1092,8 @@ static int saa5246a_probe(struct i2c_client *client,
/* Register it */
err = video_register_device(t->vdev, VFL_TYPE_VTX, -1);
if (err < 0) {
- kfree(t);
video_device_release(t->vdev);
- t->vdev = NULL;
+ kfree(t);
return err;
}
return 0;