net: bonding: Fix error checking for debugfs_create_dir()

[PATCH net v3] net: bonding: Fix error checking for debugfs_create_dir()

Posted by Wang Ming 2 years, 6 months ago

The debugfs_create_dir() function returns error pointers,
it never returns NULL. Most incorrect error checks were fixed,
but the one in bond_create_debugfs() was forgotten.

Fixes: 52333512701b ("net: bonding: remove unnecessary braces")
Signed-off-by: Wang Ming <machel@vivo.com>
---
 drivers/net/bonding/bond_debugfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c
index 594094526648..d4a82f276e87 100644
--- a/drivers/net/bonding/bond_debugfs.c
+++ b/drivers/net/bonding/bond_debugfs.c
@@ -88,7 +88,7 @@ void bond_create_debugfs(void)
 {
 	bonding_debug_root = debugfs_create_dir("bonding", NULL);
 
-	if (!bonding_debug_root)
+	if (IS_ERR(bonding_debug_root))
 		pr_warn("Warning: Cannot create bonding directory in debugfs\n");
 }
 
-- 
2.25.1

Re: [PATCH net v3] net: bonding: Fix error checking for debugfs_create_dir()

Posted by Tariq Toukan 2 years, 6 months ago


On 17/07/2023 11:53, Wang Ming wrote:
> The debugfs_create_dir() function returns error pointers,
> it never returns NULL. Most incorrect error checks were fixed,
> but the one in bond_create_debugfs() was forgotten.
> 
> Fixes: 52333512701b ("net: bonding: remove unnecessary braces")

It's not this commit to blame...
Issue was there in first place, starting in commit f073c7ca29a4 
("bonding: add the debugfs facility to the bonding driver").


> Signed-off-by: Wang Ming <machel@vivo.com>
> ---
>   drivers/net/bonding/bond_debugfs.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c
> index 594094526648..d4a82f276e87 100644
> --- a/drivers/net/bonding/bond_debugfs.c
> +++ b/drivers/net/bonding/bond_debugfs.c
> @@ -88,7 +88,7 @@ void bond_create_debugfs(void)
>   {
>   	bonding_debug_root = debugfs_create_dir("bonding", NULL);
>   
> -	if (!bonding_debug_root)
> +	if (IS_ERR(bonding_debug_root))
>   		pr_warn("Warning: Cannot create bonding directory in debugfs\n");
>   }
>

Re: [PATCH net v3] net: bonding: Fix error checking for debugfs_create_dir()

Posted by Jay Vosburgh 2 years, 6 months ago

Tariq Toukan <ttoukan.linux@gmail.com> wrote:
>On 17/07/2023 11:53, Wang Ming wrote:
>> The debugfs_create_dir() function returns error pointers,
>> it never returns NULL. Most incorrect error checks were fixed,
>> but the one in bond_create_debugfs() was forgotten.
>> Fixes: 52333512701b ("net: bonding: remove unnecessary braces")
>
>It's not this commit to blame...
>Issue was there in first place, starting in commit f073c7ca29a4 ("bonding:
>add the debugfs facility to the bonding driver").

	Agreed; please upate the Fixes: commit and resubmit, thanks.

	-J

>
>> Signed-off-by: Wang Ming <machel@vivo.com>
>> ---
>>   drivers/net/bonding/bond_debugfs.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> diff --git a/drivers/net/bonding/bond_debugfs.c
>> b/drivers/net/bonding/bond_debugfs.c
>> index 594094526648..d4a82f276e87 100644
>> --- a/drivers/net/bonding/bond_debugfs.c
>> +++ b/drivers/net/bonding/bond_debugfs.c
>> @@ -88,7 +88,7 @@ void bond_create_debugfs(void)
>>   {
>>   	bonding_debug_root = debugfs_create_dir("bonding", NULL);
>>   -	if (!bonding_debug_root)
>> +	if (IS_ERR(bonding_debug_root))
>>   		pr_warn("Warning: Cannot create bonding directory in debugfs\n");
>>   }
>>   

---
	-Jay Vosburgh, jay.vosburgh@canonical.com