Commit c069db76 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o

ext4: fix memory leak in parse_apply_sb_mount_options()

If processing the on-disk mount options fails after any memory was
allocated in the ext4_fs_context, e.g. s_qf_names, then this memory is
leaked.  Fix this by calling ext4_fc_free() instead of kfree() directly.

Reproducer:

    mkfs.ext4 -F /dev/vdc
    tune2fs /dev/vdc -E mount_opts=usrjquota=file
    echo clear > /sys/kernel/debug/kmemleak
    mount /dev/vdc /vdc
    echo scan > /sys/kernel/debug/kmemleak
    sleep 5
    echo scan > /sys/kernel/debug/kmemleak
    cat /sys/kernel/debug/kmemleak

Fixes: 7edfd85b ("ext4: Completely separate options parsing and sb setup")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Tested-by: default avatarRitesh Harjani <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220513231605.175121-2-ebiggers@kernel.orgSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent cb8435dc
...@@ -2628,8 +2628,10 @@ static int parse_apply_sb_mount_options(struct super_block *sb, ...@@ -2628,8 +2628,10 @@ static int parse_apply_sb_mount_options(struct super_block *sb,
ret = ext4_apply_options(fc, sb); ret = ext4_apply_options(fc, sb);
out_free: out_free:
kfree(s_ctx); if (fc) {
kfree(fc); ext4_fc_free(fc);
kfree(fc);
}
kfree(s_mount_opts); kfree(s_mount_opts);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment