diff options
| author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-08-24 14:27:46 +0200 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:22:38 -0400 |
| commit | 085f36c317cba8b8955c5da5f59c7486345d2bbb (patch) | |
| tree | eeb62ec9cf2f144fc5f3b72ef3e4597d8be93f96 | |
| parent | 6e4129f8163460c79bb99887bc6f791196fcbda2 (diff) | |
| download | linux-stable-085f36c317cba8b8955c5da5f59c7486345d2bbb.tar.gz linux-stable-085f36c317cba8b8955c5da5f59c7486345d2bbb.tar.bz2 linux-stable-085f36c317cba8b8955c5da5f59c7486345d2bbb.zip | |
media: dvbdev: Fix memleak in dvb_register_device
[ Upstream commit 167faadfcf9339088910e9e85a1b711fcbbef8e9 ]
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>
Stable-dep-of: 8c64f4cdf4e6 ("media: edia: dvbdev: fix a use-after-free")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/media/dvb-core/dvbdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 5d68ad0ac5d2..8273c969358e 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -547,6 +547,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", |