Commit 15126b91 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

media: pci: cx23885: check cx23885_vdev_init() return 



cx23885_vdev_init() can return a NULL pointer, but that pointer
is used in the next line without a check.

Add a NULL pointer check and go to the error unwind if it is NULL.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: default avatarSicong Huang <huangsicong@iie.ac.cn>
parent 35546945

drivers/media/pci/cx23885/cx23885-video.c

+8 −0
Original line number Diff line number Diff line
@@ -1354,6 +1354,10 @@ int cx23885_video_register(struct cx23885_dev *dev) 
	/* register Video device */

	dev->video_dev = cx23885_vdev_init(dev, dev->pci,

		&cx23885_video_template, "video");

	if (!dev->video_dev) {

		err = -ENOMEM;

		goto fail_unreg;

	}

	dev->video_dev->queue = &dev->vb2_vidq;

	dev->video_dev->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

				      V4L2_CAP_AUDIO | V4L2_CAP_VIDEO_CAPTURE;
@@ -1382,6 +1386,10 @@ int cx23885_video_register(struct cx23885_dev *dev) 
	/* register VBI device */

	dev->vbi_dev = cx23885_vdev_init(dev, dev->pci,

		&cx23885_vbi_template, "vbi");

	if (!dev->vbi_dev) {

		err = -ENOMEM;

		goto fail_unreg;

	}

	dev->vbi_dev->queue = &dev->vb2_vbiq;

	dev->vbi_dev->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

				    V4L2_CAP_AUDIO | V4L2_CAP_VBI_CAPTURE;