Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e31b096 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: pci: cx23885: check cx23885_vdev_init() return 



[ Upstream commit 15126b916e39b0cb67026b0af3c014bfeb1f76b3 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c08d0205

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

+8 −0
Original line number Diff line number Diff line
@@ -1297,6 +1297,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;

	err = video_register_device(dev->video_dev, VFL_TYPE_GRABBER,

				    video_nr[dev->nr]);
@@ -1311,6 +1315,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;

	err = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,

				    vbi_nr[dev->nr]);