summaryrefslogtreecommitdiff
path: root/drivers/uio
diff options
context:
space:
mode:
authorLiu Jian <liujian56@huawei.com>2019-01-23 06:45:37 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-27 14:46:15 +0100
commit1b97b03ace9e5f2d84dba9e8e347e76cfda40dbf (patch)
tree5a8a0c568b4328dc6367d834f1312e2848fe89f0 /drivers/uio
parent35eb06fa70302bc971342646ee3a0012e6d2e401 (diff)
driver: uio: fix possible memory leak in __uio_register_device
[ Upstream commit 1a392b3de7c5747506b38fc14b2e79977d3c7770 ] 'idev' is malloced in __uio_register_device() and leak free it before leaving from the uio_get_minor() error handing case, it will cause memory leak. Fixes: a93e7b331568 ("uio: Prevent device destruction while fds are open") Signed-off-by: Liu Jian <liujian56@huawei.com> Reviewed-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index fb5c9701b1fb..4e9b0ff79b13 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -939,8 +939,10 @@ int __uio_register_device(struct module *owner,
atomic_set(&idev->event, 0);
ret = uio_get_minor(idev);
- if (ret)
+ if (ret) {
+ kfree(idev);
return ret;
+ }
idev->dev.devt = MKDEV(uio_major, idev->minor);
idev->dev.class = &uio_class;