mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 23:24:22 -04:00
Merge "f2fs: Fix double free issue for s_encoding"
This commit is contained in:
commit
43626c0ab3
1 changed files with 8 additions and 2 deletions
|
|
@ -1265,7 +1265,10 @@ static void f2fs_put_super(struct super_block *sb)
|
|||
for (i = 0; i < NR_PAGE_TYPE; i++)
|
||||
kvfree(sbi->write_io[i]);
|
||||
#ifdef CONFIG_UNICODE
|
||||
utf8_unload(sb->s_encoding);
|
||||
if (sb->s_encoding) {
|
||||
utf8_unload(sb->s_encoding);
|
||||
sb->s_encoding = NULL;
|
||||
}
|
||||
#endif
|
||||
kvfree(sbi);
|
||||
}
|
||||
|
|
@ -3842,7 +3845,10 @@ free_bio_info:
|
|||
kvfree(sbi->write_io[i]);
|
||||
|
||||
#ifdef CONFIG_UNICODE
|
||||
utf8_unload(sb->s_encoding);
|
||||
if (sb->s_encoding) {
|
||||
utf8_unload(sb->s_encoding);
|
||||
sb->s_encoding = NULL;
|
||||
}
|
||||
#endif
|
||||
free_options:
|
||||
#ifdef CONFIG_QUOTA
|
||||
|
|
|
|||
Loading…
Reference in a new issue