From d9d13f4b76a01fd80cc1d5b316b74db5f75fc77b Mon Sep 17 00:00:00 2001 From: Hyeongseok Kim Date: Thu, 12 Nov 2020 18:14:54 +0900 Subject: [PATCH] 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 Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim (cherry picked from commit 89ff6005039a878afac87889fee748fa3f957c3a) Bug: 187129171 Signed-off-by: Connor O'Brien Change-Id: Ib29e84c8e77e710fd2f9649a56750d33fd620fba --- fs/f2fs/super.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8b64af017733..3d63a89daa18 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -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