Skip to content

Commit 6b5c0e0

Browse files
LiBaokun96akpm00
authored andcommitted
squashfs: fix null-ptr-deref in squashfs_fill_super
When squashfs_read_table() returns an error or `sb->s_magic != SQUASHFS_MAGIC`, enters the error branch and calls msblk->thread_ops->destroy(msblk) to destroy msblk. However, msblk->thread_ops has not been initialized. Therefore, the following problem is triggered: ================================================================== BUG: KASAN: null-ptr-deref in squashfs_fill_super+0xe7a/0x13b0 Read of size 8 at addr 0000000000000008 by task swapper/0/1 CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc3-next-20221031 torvalds#367 Call Trace: <TASK> dump_stack_lvl+0x73/0x9f print_report+0x743/0x759 kasan_report+0xc0/0x120 __asan_load8+0xd3/0x140 squashfs_fill_super+0xe7a/0x13b0 get_tree_bdev+0x27b/0x450 squashfs_get_tree+0x19/0x30 vfs_get_tree+0x49/0x150 path_mount+0xaae/0x1350 init_mount+0xad/0x100 do_mount_root+0xbc/0x1d0 mount_block_root+0x173/0x316 mount_root+0x223/0x236 prepare_namespace+0x1eb/0x237 kernel_init_freeable+0x528/0x576 kernel_init+0x29/0x250 ret_from_fork+0x1f/0x30 </TASK> ================================================================== To solve this issue, msblk->thread_ops is initialized immediately after msblk is assigned a value. Link: https://lkml.kernel.org/r/[email protected] Fixes: b064577 ("squashfs: add the mount parameter theads=<single|multi|percpu>") Signed-off-by: Baokun Li <[email protected]> Reviewed-by: Xiaoming Ni <[email protected]> Reviewed-by: Phillip Lougher <[email protected]> Cc: Yu Kuai <[email protected]> Cc: Zhang Yi <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1e1f687 commit 6b5c0e0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/squashfs/super.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)
197197
return -ENOMEM;
198198
}
199199
msblk = sb->s_fs_info;
200+
msblk->thread_ops = opts->thread_ops;
200201

201202
msblk->panic_on_errors = (opts->errors == Opt_errors_panic);
202203

@@ -231,7 +232,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)
231232
sb->s_bdev);
232233
goto failed_mount;
233234
}
234-
msblk->thread_ops = opts->thread_ops;
235+
235236
if (opts->thread_num == 0) {
236237
msblk->max_thread_num = msblk->thread_ops->max_decompressors();
237238
} else {

0 commit comments

Comments
 (0)