mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 02:53:36 +02:00
ntfs3: fix double free of sbi->options->nls and clarify ownership of fc->fs_private
commit02f312754c("ntfs3: fix use-after-free of sbi->options in cmp_fnames") introduced a use-after-free bug due to improper handling of sbi->options in error paths. This resulted in crashes when superblock cleanup is performed in ntfs_put_super. This patch ensures that the options structure and its subfields are properly freed, preventing the memory corruption and use-after-free errors. Fixes:02f312754c("ntfs3: fix use-after-free of sbi->options in cmp_fnames") Reported-by: syzbot+cc433e4cd6d54736bf80@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=cc433e4cd6d54736bf80 Signed-off-by: YangWen <anmuxixixi@gmail.com> [almaz.alexandrovich@paragon-software.com: added fixes and closes tags] Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
parent
a8a3ca23bb
commit
aee4d5a521
|
|
@ -705,7 +705,7 @@ static void ntfs_put_super(struct super_block *sb)
|
|||
|
||||
if (sbi->options) {
|
||||
unload_nls(sbi->options->nls);
|
||||
kfree(sbi->options->nls);
|
||||
kfree(sbi->options->nls_name);
|
||||
kfree(sbi->options);
|
||||
sbi->options = NULL;
|
||||
}
|
||||
|
|
@ -1251,6 +1251,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
|||
}
|
||||
}
|
||||
sbi->options = options;
|
||||
fc->fs_private = NULL;
|
||||
sb->s_flags |= SB_NODIRATIME;
|
||||
sb->s_magic = 0x7366746e; // "ntfs"
|
||||
sb->s_op = &ntfs_sops;
|
||||
|
|
@ -1676,7 +1677,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
|||
out:
|
||||
if (sbi && sbi->options) {
|
||||
unload_nls(sbi->options->nls);
|
||||
kfree(sbi->options->nls);
|
||||
kfree(sbi->options->nls_name);
|
||||
kfree(sbi->options);
|
||||
sbi->options = NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user