V4L/DVB (13576): ir-common: fix an oops caused by the usage of an initialized drvdata
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 6 Dec 2009 11:32:49 +0000 (08:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 16 Dec 2009 02:18:09 +0000 (00:18 -0200)
As reported by Sander Eikelenboom <linux@eikelemboon.it>:

> Tried to update my v4l-dvb modules today, but got a bug with my pinnacle
> card, seems to be related to the recent changes in the ir code.
>
> Dec  5 23:30:25 security kernel: [    5.735698] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
> Dec  5 23:30:25 security kernel: [    5.735716] IP: [<ffffffffa00997be>] :ir_common:ir_input_free+0x26/0x3e

Thanks-to: Sander Eikelenboom <linux@eikelemboon.it> for reporting and testing the fix.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/ir-keytable.c

index 26ce5bc2fdd545de4bf3088e655e1ec7e9a0507a..ceef0e82fb4b649f14c618c431483a552606a4b8 100644 (file)
@@ -419,6 +419,9 @@ void ir_input_free(struct input_dev *dev)
 {
        struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
 
+       if (!rc_tab)
+               return;
+
        IR_dprintk(1, "Freed keycode table\n");
 
        rc_tab->size = 0;