Skip to content

Commit b4b4fda

Browse files
LiBaokun96tytso
authored andcommitted
ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super()
In the following concurrency we will access the uninitialized rs->lock: ext4_fill_super ext4_register_sysfs // sysfs registered msg_ratelimit_interval_ms // Other processes modify rs->interval to // non-zero via msg_ratelimit_interval_ms ext4_orphan_cleanup ext4_msg(sb, KERN_INFO, "Errors on filesystem, " __ext4_msg ___ratelimit(&(EXT4_SB(sb)->s_msg_ratelimit_state) if (!rs->interval) // do nothing if interval is 0 return 1; raw_spin_trylock_irqsave(&rs->lock, flags) raw_spin_trylock(lock) _raw_spin_trylock __raw_spin_trylock spin_acquire(&lock->dep_map, 0, 1, _RET_IP_) lock_acquire __lock_acquire register_lock_class assign_lock_key dump_stack(); ratelimit_state_init(&sbi->s_msg_ratelimit_state, 5 * HZ, 10); raw_spin_lock_init(&rs->lock); // init rs->lock here and get the following dump_stack: ========================================================= INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator. CPU: 12 PID: 753 Comm: mount Tainted: G E 6.7.0-rc6-next-20231222 #504 [...] Call Trace: dump_stack_lvl+0xc5/0x170 dump_stack+0x18/0x30 register_lock_class+0x740/0x7c0 __lock_acquire+0x69/0x13a0 lock_acquire+0x120/0x450 _raw_spin_trylock+0x98/0xd0 ___ratelimit+0xf6/0x220 __ext4_msg+0x7f/0x160 [ext4] ext4_orphan_cleanup+0x665/0x740 [ext4] __ext4_fill_super+0x21ea/0x2b10 [ext4] ext4_fill_super+0x14d/0x360 [ext4] [...] ========================================================= Normally interval is 0 until s_msg_ratelimit_state is initialized, so ___ratelimit() does nothing. But registering sysfs precedes initializing rs->lock, so it is possible to change rs->interval to a non-zero value via the msg_ratelimit_interval_ms interface of sysfs while rs->lock is uninitialized, and then a call to ext4_msg triggers the problem by accessing an uninitialized rs->lock. Therefore register sysfs after all initializations are complete to avoid such problems. Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20240102133730.1098120-1-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent ea4fd93 commit b4b4fda

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

fs/ext4/super.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5550,19 +5550,15 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
55505550
if (err)
55515551
goto failed_mount6;
55525552

5553-
err = ext4_register_sysfs(sb);
5554-
if (err)
5555-
goto failed_mount7;
5556-
55575553
err = ext4_init_orphan_info(sb);
55585554
if (err)
5559-
goto failed_mount8;
5555+
goto failed_mount7;
55605556
#ifdef CONFIG_QUOTA
55615557
/* Enable quota usage during mount. */
55625558
if (ext4_has_feature_quota(sb) && !sb_rdonly(sb)) {
55635559
err = ext4_enable_quotas(sb);
55645560
if (err)
5565-
goto failed_mount9;
5561+
goto failed_mount8;
55665562
}
55675563
#endif /* CONFIG_QUOTA */
55685564

@@ -5588,7 +5584,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
55885584
ext4_msg(sb, KERN_INFO, "recovery complete");
55895585
err = ext4_mark_recovery_complete(sb, es);
55905586
if (err)
5591-
goto failed_mount10;
5587+
goto failed_mount9;
55925588
}
55935589

55945590
if (test_opt(sb, DISCARD) && !bdev_max_discard_sectors(sb->s_bdev))
@@ -5605,15 +5601,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
56055601
atomic_set(&sbi->s_warning_count, 0);
56065602
atomic_set(&sbi->s_msg_count, 0);
56075603

5604+
/* Register sysfs after all initializations are complete. */
5605+
err = ext4_register_sysfs(sb);
5606+
if (err)
5607+
goto failed_mount9;
5608+
56085609
return 0;
56095610

5610-
failed_mount10:
5611+
failed_mount9:
56115612
ext4_quotas_off(sb, EXT4_MAXQUOTAS);
5612-
failed_mount9: __maybe_unused
5613+
failed_mount8: __maybe_unused
56135614
ext4_release_orphan_info(sb);
5614-
failed_mount8:
5615-
ext4_unregister_sysfs(sb);
5616-
kobject_put(&sbi->s_kobj);
56175615
failed_mount7:
56185616
ext4_unregister_li_request(sb);
56195617
failed_mount6:

0 commit comments

Comments
 (0)