From 6cfb145e340e56bd79b06ded5fd2d20cf055fee6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 10 May 2019 14:38:24 -0400 Subject: [PATCH] mke2fs: fix memory leak when parsing encoding flags Also fix extended-options usage string. Addresses-Coverity-Bug: 1444984 Signed-off-by: Theodore Ts'o --- misc/mke2fs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 0ba2bf3..d7cf257 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1102,7 +1102,7 @@ static void parse_extended_opts(struct ext2_super_block *param, "\ttest_fs\n" "\tdiscard\n" "\tnodiscard\n" - "\encoding=\n" + "\tencoding=\n" "\tencoding_flags=\n" "\tquotatype=\n\n"), badopt ? badopt : ""); @@ -2399,6 +2399,7 @@ profile_error: en); exit(1); } + free(en); fs_param.s_encoding = encoding; ef = get_string_from_profile(fs_types, "encoding_flags", NULL); if (ef) { @@ -2408,6 +2409,7 @@ profile_error: _("Unknown encoding flags from profile: %s"), ef); exit(1); } + free(ef); } else fs_param.s_encoding_flags = e2p_get_encoding_flags(encoding); -- 1.8.3.1