diff options
| author | YangWen <anmuxixixi@gmail.com> | 2025-10-31 00:20:45 +0800 |
|---|---|---|
| committer | Konstantin Komarov <almaz.alexandrovich@paragon-software.com> | 2025-11-11 16:08:18 +0100 |
| commit | aee4d5a521e94f658e46c904e08a473daa9c8fc0 (patch) | |
| tree | 13a39d03b5ccec03d08b607eb816400fb84e78ed /fs/ntfs3 | |
| parent | a8a3ca23bbd9d849308a7921a049330dc6c91398 (diff) | |
ntfs3: fix double free of sbi->options->nls and clarify ownership of fc->fs_private
commit 02f312754c87 ("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: 02f312754c87 ("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>
Diffstat (limited to 'fs/ntfs3')
| -rw-r--r-- | fs/ntfs3/super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index a478ec510640..96f56333cf99 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -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 @@ put_inode_out: 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; } |