iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix a memory leak

Browse Source 
This fixes a regression from "bcachefs: Heap allocate printbufs" -
bch2_sb_field_validate() was leaking an error string.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-02-27 11:57:42 -05:00 committed by Kent Overstreet
parent bf3efff5e4
commit 7db4cbd0a5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/bcachefs/super-io.c
View File

@ -1423,24 +1423,25 @@ static const struct bch_sb_field_ops *bch2_sb_field_ops[] = {
};
static int bch2_sb_field_validate(struct bch_sb *sb, struct bch_sb_field *f,
struct printbuf *orig_err)
struct printbuf *err)
{
unsigned type = le32_to_cpu(f->type);
struct printbuf err = *orig_err;
struct printbuf field_err = PRINTBUF;
int ret;
if (type >= BCH_SB_FIELD_NR)
return 0;
pr_buf(&err, "Invalid superblock section %s: ", bch2_sb_fields[type]);
ret = bch2_sb_field_ops[type]->validate(sb, f, &err);
ret = bch2_sb_field_ops[type]->validate(sb, f, &field_err);
if (ret) {
pr_newline(&err);
bch2_sb_field_to_text(&err, sb, f);
*orig_err = err;
pr_buf(err, "Invalid superblock section %s: %s",
bch2_sb_fields[type],
field_err.buf);
pr_newline(err);
bch2_sb_field_to_text(err, sb, f);
}
printbuf_exit(&field_err);
return ret;
}