2024-04-12 06:37:07

by Chao Yu

Subject: [PATCH v2] bcachefs: fix error path of __bch2_read_super()

In __bch2_read_super(), if kstrdup() fails, it needs to release memory
in sb->holder, fix to call bch2_free_super() in the error path.

Signed-off-by: Chao Yu <[email protected]>
---
v2:
- add error message in error path pointed out by Hongbo Li.
fs/bcachefs/super-io.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index ad28e370b640..cc80d7d30b8c 100644
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -698,8 +698,11 @@ static int __bch2_read_super(const char *path, struct bch_opts *opts,
return -ENOMEM;

sb->sb_name = kstrdup(path, GFP_KERNEL);
- if (!sb->sb_name)
- return -ENOMEM;
+ if (!sb->sb_name) {
+ ret = -ENOMEM;
+ prt_printf(&err, "error allocating memory for sb_name");
+ goto err;
+ }

#ifndef __KERNEL__
if (opt_get(*opts, direct_io) == false)
--
2.40.1

2024-04-12 07:07:16

by Hongbo Li

Subject: Re: [PATCH v2] bcachefs: fix error path of __bch2_read_super()

Reviewed-by: Hongbo Li <[email protected]>

On 2024/4/12 14:36, Chao Yu wrote:
> In __bch2_read_super(), if kstrdup() fails, it needs to release memory
> in sb->holder, fix to call bch2_free_super() in the error path.
>
> Signed-off-by: Chao Yu <[email protected]>
> ---
> v2:
> - add error message in error path pointed out by Hongbo Li.
> fs/bcachefs/super-io.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
> index ad28e370b640..cc80d7d30b8c 100644
> --- a/fs/bcachefs/super-io.c
> +++ b/fs/bcachefs/super-io.c
> @@ -698,8 +698,11 @@ static int __bch2_read_super(const char *path, struct bch_opts *opts,
> return -ENOMEM;
>
> sb->sb_name = kstrdup(path, GFP_KERNEL);
> - if (!sb->sb_name)
> - return -ENOMEM;
> + if (!sb->sb_name) {
> + ret = -ENOMEM;
> + prt_printf(&err, "error allocating memory for sb_name");
> + goto err;
> + }
>
> #ifndef __KERNEL__
> if (opt_get(*opts, direct_io) == false)

2024-04-15 02:08:47

by Hongbo Li

Subject: Re: [PATCH v2] bcachefs: fix error path of __bch2_read_super()

This patch fixes the issue with memory reclamation in certain case. May
be we should use it! ????

On 2024/4/12 14:53, Hongbo Li wrote:
> Reviewed-by: Hongbo Li <[email protected]>
>
> On 2024/4/12 14:36, Chao Yu wrote:
>> In __bch2_read_super(), if kstrdup() fails, it needs to release memory
>> in sb->holder, fix to call bch2_free_super() in the error path.
>>
>> Signed-off-by: Chao Yu <[email protected]>
>> ---
>> v2:
>> - add error message in error path pointed out by Hongbo Li.
>>   fs/bcachefs/super-io.c | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
>> index ad28e370b640..cc80d7d30b8c 100644
>> --- a/fs/bcachefs/super-io.c
>> +++ b/fs/bcachefs/super-io.c
>> @@ -698,8 +698,11 @@ static int __bch2_read_super(const char *path,
>> struct bch_opts *opts,
>>           return -ENOMEM;
>>       sb->sb_name = kstrdup(path, GFP_KERNEL);
>> -    if (!sb->sb_name)
>> -        return -ENOMEM;
>> +    if (!sb->sb_name) {
>> +        ret = -ENOMEM;
>> +        prt_printf(&err, "error allocating memory for sb_name");
>> +        goto err;
>> +    }
>>   #ifndef __KERNEL__
>>       if (opt_get(*opts, direct_io) == false)
>