]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
media: dvbdev: Fix memleak in dvb_register_device
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Mon, 24 Aug 2020 12:27:46 +0000 (14:27 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 17 Nov 2020 05:57:54 +0000 (06:57 +0100)
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>
drivers/media/dvb-core/dvbdev.c

index 959fa2820259752e7a56dff3b7c64c54651fb2e6..5ff7bedee2477adb8727be3da2474b07ceaaa61f 100644 (file)
@@ -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",