Commit aef6b782 authored by Dinghao Liu's avatar Dinghao Liu Committed by liwei
Browse files

media: dvbdev: Fix memleak in dvb_register_device 

mainline inclusion
from mainline-v5.11-rc1
commit 167faadf
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=167faadfcf9339088910e9e85a1b711fcbbef8e9



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

When device_create() fails, dvbdev and dvbdevfops should
be freed just like when dvb_register_media_device() fails.

Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent 25785c02

drivers/media/dvb-core/dvbdev.c

+3 −0
Original line number Diff line number Diff line
@@ -545,6 +545,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	if (IS_ERR(clsdev)) {

		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);

		kfree(dvbdevfops);

		kfree(dvbdev);

		return PTR_ERR(clsdev);

	}

	dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",