Commit 74083f78 authored Nov 14, 2023 by Mauro Carvalho Chehab Committed by liwei Nov 14, 2023

media: dvbdev: fix error logic at dvb_register_device()

mainline inclusion
from mainline-v5.14-rc1
commit 1fec2ecc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I635IG
CVE: CVE-2022-45884

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1fec2ecc252301110e4149e6183fa70460d29674



--------------------------------

As reported by smatch:

	drivers/media/dvb-core/dvbdev.c: drivers/media/dvb-core/dvbdev.c:510 dvb_register_device() warn: '&dvbdev->list_head' not removed from list
	drivers/media/dvb-core/dvbdev.c: drivers/media/dvb-core/dvbdev.c:530 dvb_register_device() warn: '&dvbdev->list_head' not removed from list
	drivers/media/dvb-core/dvbdev.c: drivers/media/dvb-core/dvbdev.c:545 dvb_register_device() warn: '&dvbdev->list_head' not removed from list

The error logic inside dvb_register_device() doesn't remove
devices from the dvb_adapter_list in case of errors.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: liwei <liwei728@huawei.com>

parent aef6b782

drivers/media/dvb-core/dvbdev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -511,6 +511,7 @@ int dvb_register_device(struct dvb_adapter adap, struct dvb_device *pdvbdev,
		break;

		if (minor == MAX_DVB_MINORS) {
		list_del (&dvbdev->list_head);
		kfree(dvbdevfops);
		kfree(dvbdev);
		up_write(&minor_rwsem);
		@@ -531,6 +532,7 @@ int dvb_register_device(struct dvb_adapter adap, struct dvb_device *pdvbdev,
		__func__);

		dvb_media_device_free(dvbdev);
		list_del (&dvbdev->list_head);
		kfree(dvbdevfops);
		kfree(dvbdev);
		mutex_unlock(&dvbdev_register_lock);
		@@ -546,6 +548,7 @@ int dvb_register_device(struct dvb_adapter adap, struct dvb_device *pdvbdev,
		pr_err("%s: failed to create device dvb%d.%s%d (%ld)\n",
		__func__, adap->num, dnames[type], id, PTR_ERR(clsdev));
		dvb_media_device_free(dvbdev);
		list_del (&dvbdev->list_head);
		kfree(dvbdevfops);
		kfree(dvbdev);
		return PTR_ERR(clsdev);