summaryrefslogtreecommitdiffstats
path: root/drivers/dio
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2022-11-09 14:40:36 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-09 15:12:37 +0100
commite63e99397b2613d50a5f4f02ed07307e67a190f1 (patch)
tree976a0665237db0a9a86706b095487a054b3d8ef5 /drivers/dio
parent30a0b95b1335e12efef89dd78518ed3e4a71a763 (diff)
downloadlinux-e63e99397b2613d50a5f4f02ed07307e67a190f1.tar.gz
linux-e63e99397b2613d50a5f4f02ed07307e67a190f1.tar.bz2
linux-e63e99397b2613d50a5f4f02ed07307e67a190f1.zip
drivers: dio: fix possible memory leak in dio_init()
If device_register() returns error, the 'dev' and name needs be freed. Add a release function, and then call put_device() in the error path, so the name is freed in kobject_cleanup() and to the 'dev' is freed in release function. Fixes: 2e4c77bea3d8 ("m68k: dio - Kill warn_unused_result warnings") Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20221109064036.1835346-1-yangyingliang@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dio')
-rw-r--r--drivers/dio/dio.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index 0e5a5662d5a4..0a051d656880 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -109,6 +109,12 @@ static char dio_no_name[] = { 0 };
#endif /* CONFIG_DIO_CONSTANTS */
+static void dio_dev_release(struct device *dev)
+{
+ struct dio_dev *ddev = container_of(dev, typeof(struct dio_dev), dev);
+ kfree(ddev);
+}
+
int __init dio_find(int deviceid)
{
/* Called to find a DIO device before the full bus scan has run.
@@ -225,6 +231,7 @@ static int __init dio_init(void)
dev->bus = &dio_bus;
dev->dev.parent = &dio_bus.dev;
dev->dev.bus = &dio_bus_type;
+ dev->dev.release = dio_dev_release;
dev->scode = scode;
dev->resource.start = pa;
dev->resource.end = pa + DIO_SIZE(scode, va);
@@ -252,6 +259,7 @@ static int __init dio_init(void)
if (error) {
pr_err("DIO: Error registering device %s\n",
dev->name);
+ put_device(&dev->dev);
continue;
}
error = dio_create_sysfs_dev_files(dev);