github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ntfs3: fix double free of sbi->options->nls and clarify ownership of fc->fs_private

Browse Source 
commit 02f312754c ("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:
YangWen 2025-10-31 00:20:45 +08:00 committed by Konstantin Komarov
parent a8a3ca23bb
commit aee4d5a521
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ntfs3/super.c
View File

@ -705,7 +705,7 @@ static void ntfs_put_super(struct super_block *sb)
if (sbi->options) { if (sbi->options) {
unload_nls(sbi->options->nls); unload_nls(sbi->options->nls);
kfree(sbi->options->nls); kfree(sbi->options->nls_name);
kfree(sbi->options); kfree(sbi->options);
sbi->options = NULL; sbi->options = NULL;
} }
@ -1251,6 +1251,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
} }
} }
sbi->options = options; sbi->options = options;
fc->fs_private = NULL;
sb->s_flags |= SB_NODIRATIME; sb->s_flags |= SB_NODIRATIME;
sb->s_magic = 0x7366746e; // "ntfs" sb->s_magic = 0x7366746e; // "ntfs"
sb->s_op = &ntfs_sops; sb->s_op = &ntfs_sops;
@ -1676,7 +1677,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
out: out:
if (sbi && sbi->options) { if (sbi && sbi->options) {
unload_nls(sbi->options->nls); unload_nls(sbi->options->nls);
kfree(sbi->options->nls); kfree(sbi->options->nls_name);
kfree(sbi->options); kfree(sbi->options);
sbi->options = NULL; sbi->options = NULL;
} }