aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDinghao Liu <dinghao.liu@zju.edu.cn>2020-08-24 14:27:46 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-11-17 06:57:54 +0100
commit167faadfcf9339088910e9e85a1b711fcbbef8e9 (patch)
treea1355fba6d83706b3ff4055eedf9609f4ee87edf
parentmedia: usb: dvb-usb-v2: zd1301: fix missing platform_device_unregister() (diff)
downloadlinux-dev-167faadfcf9339088910e9e85a1b711fcbbef8e9.tar.xz
linux-dev-167faadfcf9339088910e9e85a1b711fcbbef8e9.zip
media: dvbdev: Fix memleak in dvb_register_device
When device_create() fails, dvbdev and dvbdevfops should be freed just like when dvb_register_media_device() fails. Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--drivers/media/dvb-core/dvbdev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 959fa2820259..5ff7bedee247 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -539,6 +539,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",