* [PATCH v2] bcachefs: fix error path of __bch2_read_super()
@ 2024-04-12 6:36 Chao Yu
2024-04-12 6:53 ` Hongbo Li
0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2024-04-12 6:36 UTC (permalink / raw)
To: Kent Overstreet, Brian Foster; +Cc: linux-bcachefs, linux-kernel, Chao Yu
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 <chao@kernel.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] bcachefs: fix error path of __bch2_read_super()
2024-04-12 6:36 [PATCH v2] bcachefs: fix error path of __bch2_read_super() Chao Yu
@ 2024-04-12 6:53 ` Hongbo Li
2024-04-15 2:03 ` Hongbo Li
0 siblings, 1 reply; 3+ messages in thread
From: Hongbo Li @ 2024-04-12 6:53 UTC (permalink / raw)
To: Chao Yu, Kent Overstreet, Brian Foster; +Cc: linux-bcachefs, linux-kernel
Reviewed-by: Hongbo Li <lihongbo22@huawei.com>
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 <chao@kernel.org>
> ---
> 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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] bcachefs: fix error path of __bch2_read_super()
2024-04-12 6:53 ` Hongbo Li
@ 2024-04-15 2:03 ` Hongbo Li
0 siblings, 0 replies; 3+ messages in thread
From: Hongbo Li @ 2024-04-15 2:03 UTC (permalink / raw)
To: Kent Overstreet, Brian Foster; +Cc: linux-bcachefs, linux-kernel, Chao Yu
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 <lihongbo22@huawei.com>
>
> 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 <chao@kernel.org>
>> ---
>> 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)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-15 2:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-12 6:36 [PATCH v2] bcachefs: fix error path of __bch2_read_super() Chao Yu
2024-04-12 6:53 ` Hongbo Li
2024-04-15 2:03 ` Hongbo Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox