lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: lirc, fix NULL dereference

Browse Source 
When 'context' allocation fails in imon_probe, we jump to unlock
context->ctx_lock. This is wrong as context is NULL and the lock is
not locked.

Fix the labels.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jiri Slaby
2010-09-04 14:32:25 +02:00
committed by Greg Kroah-Hartman
parent 54669fdeb2
commit cc92ac2049
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lirc/lirc_imon.c
View File

@ -873,7 +873,7 @@ static int imon_probe(struct usb_interface *interface,
if (lirc_minor < 0) { if (lirc_minor < 0) {
err("%s: lirc_register_driver failed", __func__); err("%s: lirc_register_driver failed", __func__);
alloc_status = 7; alloc_status = 7;
goto alloc_status_switch; goto unlock;
} else } else
dev_info(dev, "Registered iMON driver " dev_info(dev, "Registered iMON driver "
"(lirc minor: %d)\n", lirc_minor); "(lirc minor: %d)\n", lirc_minor);
@ -929,8 +929,9 @@ static int imon_probe(struct usb_interface *interface,
"usb<%d:%d> initialized\n", vendor, product, ifnum, "usb<%d:%d> initialized\n", vendor, product, ifnum,
usbdev->bus->busnum, usbdev->devnum); usbdev->bus->busnum, usbdev->devnum);
alloc_status_switch: unlock:
mutex_unlock(&context->ctx_lock); mutex_unlock(&context->ctx_lock);
alloc_status_switch:
switch (alloc_status) { switch (alloc_status) {
case 7: case 7: