OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9586): Fix possible null pointer dereference in info message 

Fix case where we could end up dereferencing a NULL pointer if dev->vdev or
dev->vbi_dev were not set properly.

Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Devin Heitmueller 2008-11-12 02:05:15 -03:00 committed by Mauro Carvalho Chehab
parent a527c9f827
commit 4924044495
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/em28xx/em28xx-video.c
View File

@ -1600,8 +1600,6 @@ static void em28xx_release_resources(struct em28xx *dev)
/*FIXME: I2C IR should be disconnected */ /*FIXME: I2C IR should be disconnected */
em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
dev->vdev->num, dev->vbi_dev->num);
list_del(&dev->devlist); list_del(&dev->devlist);
if (dev->sbutton_input_dev) if (dev->sbutton_input_dev)
em28xx_deregister_snapshot_button(dev); em28xx_deregister_snapshot_button(dev);
@ -1613,6 +1611,8 @@ static void em28xx_release_resources(struct em28xx *dev)
dev->radio_dev = NULL; dev->radio_dev = NULL;
} }
if (dev->vbi_dev) { if (dev->vbi_dev) {
em28xx_info("V4L2 device /dev/vbi%d deregistered\n",
dev->vbi_dev->num);
if (-1 != dev->vbi_dev->minor) if (-1 != dev->vbi_dev->minor)
video_unregister_device(dev->vbi_dev); video_unregister_device(dev->vbi_dev);
else else
@ -1620,6 +1620,8 @@ static void em28xx_release_resources(struct em28xx *dev)
dev->vbi_dev = NULL; dev->vbi_dev = NULL;
} }
if (dev->vdev) { if (dev->vdev) {
em28xx_info("V4L2 device /dev/video%d deregistered\n",
dev->vdev->num);
if (-1 != dev->vdev->minor) if (-1 != dev->vdev->minor)
video_unregister_device(dev->vdev); video_unregister_device(dev->vdev);
else else