]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
base: dd: fix error return code of driver_sysfs_add()
authorJia-Ju Bai <baijiaju1990@gmail.com>
Wed, 24 Mar 2021 02:34:05 +0000 (19:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Mar 2021 12:55:39 +0000 (14:55 +0200)
When device_create_file() fails and returns a non-zero value,
no error return code of driver_sysfs_add() is assigned.
To fix this bug, ret is assigned with the return value of
device_create_file(), and then ret is checked.

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Link: https://lore.kernel.org/r/20210324023405.12465-1-baijiaju1990@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/dd.c

index dd327cfd6843e4a26946200e2e798dc1f400b7fd..20b69b5e0e91251f4f648a05c7a8f4a0ed40ba1a 100644 (file)
@@ -415,8 +415,11 @@ static int driver_sysfs_add(struct device *dev)
        if (ret)
                goto rm_dev;
 
-       if (!IS_ENABLED(CONFIG_DEV_COREDUMP) || !dev->driver->coredump ||
-           !device_create_file(dev, &dev_attr_coredump))
+       if (!IS_ENABLED(CONFIG_DEV_COREDUMP) || !dev->driver->coredump)
+               return 0;
+
+       ret = device_create_file(dev, &dev_attr_coredump);
+       if (!ret)
                return 0;
 
        sysfs_remove_link(&dev->kobj, "driver");