]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
media: siano: fix memory leak of debugfs members in smsdvb_hotplug
authorKeita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
Wed, 9 Sep 2020 12:56:57 +0000 (14:56 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:25:48 +0000 (14:25 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910822
[ Upstream commit abf287eeff4c6da6aa804bbd429dfd9d0dfb6ea7 ]

When dvb_create_media_graph fails, the debugfs kept inside client should
be released. However, the current implementation does not release them.

Fix this by adding a new goto label to call smsdvb_debugfs_release.

Fixes: 0d3ab8410dcb ("[media] dvb core: must check dvb_create_media_graph()")
Signed-off-by: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/media/common/siano/smsdvb-main.c

index 88f90dfd368b10a0ab1664498cd6f9232a176fff..ae17407e477a49f1b8977d2de34e35e57a4980cd 100644 (file)
@@ -1169,12 +1169,15 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
        rc = dvb_create_media_graph(&client->adapter, true);
        if (rc < 0) {
                pr_err("dvb_create_media_graph failed %d\n", rc);
-               goto client_error;
+               goto media_graph_error;
        }
 
        pr_info("DVB interface registered.\n");
        return 0;
 
+media_graph_error:
+       smsdvb_debugfs_release(client);
+
 client_error:
        dvb_unregister_frontend(&client->frontend);