UPSTREAM: f2fs: fix double free of unicode map

In case of retrying fill_super with skip_recovery,
s_encoding for casefold would not be loaded again even though it's
already been freed because it's not NULL.
Set NULL after free to prevent double freeing when unmount.

Fixes: eca4873ee1b6 ("f2fs: Use generic casefolding support")
Signed-off-by: Hyeongseok Kim <hyeongseok@gmail.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 89ff6005039a878afac87889fee748fa3f957c3a)
Bug: 187129171
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Ib29e84c8e77e710fd2f9649a56750d33fd620fba
This commit is contained in:
Hyeongseok Kim 2020-11-12 18:14:54 +09:00 committed by Connor O'Brien
parent be192b51bf
commit d9d13f4b76

View File

@ -3844,6 +3844,7 @@ free_bio_info:
#ifdef CONFIG_UNICODE
utf8_unload(sb->s_encoding);
sb->s_encoding = NULL;
#endif
free_options:
#ifdef CONFIG_QUOTA