V4L/DVB (11515): drivers/media/video/saa5249.c: fix use-after-free and leak
authorDan Carpenter <error27@gmail.com>
Tue, 14 Apr 2009 22:50:33 +0000 (19:50 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 29 Apr 2009 18:41:11 +0000 (15:41 -0300)
I moved the kfree() down a couple lines.  t->vdev is going to be in freed
memory so there is no point setting it to NULL.  I added a kfree(t) on a

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa5249.c

index 48b27fe48087c2446b2d4d452071c3aa4b696a44..271d6e931b750ecd9b7c0ee4a499f52a3833476f 100644 (file)
@@ -598,6 +598,7 @@ static int saa5249_probe(struct i2c_client *client,
        /* Now create a video4linux device */
        t->vdev = video_device_alloc();
        if (t->vdev == NULL) {
+               kfree(t);
                kfree(client);
                return -ENOMEM;
        }
@@ -617,9 +618,8 @@ static int saa5249_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;