2021-03-05 10:25:49

by Jia-Ju Bai

Subject: [PATCH] base: dd: fix error return code of driver_sysfs_add()

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 <[email protected]>
Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/base/dd.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9179825ff646..f94bbef95258 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -413,8 +413,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");
--
2.17.1

2021-03-05 17:32:49

by Rafael J. Wysocki

Subject: Re: [PATCH] base: dd: fix error return code of driver_sysfs_add()

On Fri, Mar 5, 2021 at 11:24 AM Jia-Ju Bai <[email protected]> wrote:
>
> 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 <[email protected]>
> Signed-off-by: Jia-Ju Bai <[email protected]>

Reviewed-by: Rafael J. Wysocki <[email protected]>

> ---
> drivers/base/dd.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
> index 9179825ff646..f94bbef95258 100644
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@ -413,8 +413,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");
> --
> 2.17.1
>

2021-03-23 14:02:21

by Greg Kroah-Hartman

Subject: Re: [PATCH] base: dd: fix error return code of driver_sysfs_add()

On Fri, Mar 05, 2021 at 02:24:05AM -0800, Jia-Ju Bai wrote:
> 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 <[email protected]>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> ---
> drivers/base/dd.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
> index 9179825ff646..f94bbef95258 100644
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@ -413,8 +413,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;
> +

Trailing whitespace :(

2021-03-24 21:56:47

by Jia-Ju Bai

Subject: Re: [PATCH] base: dd: fix error return code of driver_sysfs_add()

On 2021/3/23 21:57, Greg KH wrote:
> On Fri, Mar 05, 2021 at 02:24:05AM -0800, Jia-Ju Bai wrote:
>> 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 <[email protected]>
>> Signed-off-by: Jia-Ju Bai <[email protected]>
>> ---
>> drivers/base/dd.c | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
>> index 9179825ff646..f94bbef95258 100644
>> --- a/drivers/base/dd.c
>> +++ b/drivers/base/dd.c
>> @@ -413,8 +413,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;
>> +
> Trailing whitespace :

Ah, sorry, I will send a V2 patch.


Best wishes,
Jia-Ju Bai