Skip to content

Commit 6c8c501

Browse files
hsiangkaothangqn-ampere
authored andcommitted
erofs: fix pcluster use-after-free on UP platforms
[ Upstream commit 2f44013 ] During stress testing with CONFIG_SMP disabled, KASAN reports as below: ================================================================== BUG: KASAN: use-after-free in __mutex_lock+0xe5/0xc30 Read of size 8 at addr ffff8881094223f8 by task stress/7789 CPU: 0 PID: 7789 Comm: stress Not tainted 6.0.0-rc1-00002-g0d53d2e882f9 #3 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 Call Trace: <TASK> .. __mutex_lock+0xe5/0xc30 .. z_erofs_do_read_page+0x8ce/0x1560 .. z_erofs_readahead+0x31c/0x580 .. Freed by task 7787 kasan_save_stack+0x1e/0x40 kasan_set_track+0x20/0x30 kasan_set_free_info+0x20/0x40 __kasan_slab_free+0x10c/0x190 kmem_cache_free+0xed/0x380 rcu_core+0x3d5/0xc90 __do_softirq+0x12d/0x389 Last potentially related work creation: kasan_save_stack+0x1e/0x40 __kasan_record_aux_stack+0x97/0xb0 call_rcu+0x3d/0x3f0 erofs_shrink_workstation+0x11f/0x210 erofs_shrink_scan+0xdc/0x170 shrink_slab.constprop.0+0x296/0x530 drop_slab+0x1c/0x70 drop_caches_sysctl_handler+0x70/0x80 proc_sys_call_handler+0x20a/0x2f0 vfs_write+0x555/0x6c0 ksys_write+0xbe/0x160 do_syscall_64+0x3b/0x90 The root cause is that erofs_workgroup_unfreeze() doesn't reset to orig_val thus it causes a race that the pcluster reuses unexpectedly before freeing. Since UP platforms are quite rare now, such path becomes unnecessary. Let's drop such specific-designed path directly instead. Fixes: 73f5c66 ("staging: erofs: fix `erofs_workgroup_{try_to_freeze, unfreeze}'") Reviewed-by: Yue Hu <[email protected]> Reviewed-by: Chao Yu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Gao Xiang <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 463e279 commit 6c8c501

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

fs/erofs/internal.h

-29
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ struct erofs_workgroup {
143143
atomic_t refcount;
144144
};
145145

146-
#if defined(CONFIG_SMP)
147146
static inline bool erofs_workgroup_try_to_freeze(struct erofs_workgroup *grp,
148147
int val)
149148
{
@@ -172,34 +171,6 @@ static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp)
172171
return atomic_cond_read_relaxed(&grp->refcount,
173172
VAL != EROFS_LOCKED_MAGIC);
174173
}
175-
#else
176-
static inline bool erofs_workgroup_try_to_freeze(struct erofs_workgroup *grp,
177-
int val)
178-
{
179-
preempt_disable();
180-
/* no need to spin on UP platforms, let's just disable preemption. */
181-
if (val != atomic_read(&grp->refcount)) {
182-
preempt_enable();
183-
return false;
184-
}
185-
return true;
186-
}
187-
188-
static inline void erofs_workgroup_unfreeze(struct erofs_workgroup *grp,
189-
int orig_val)
190-
{
191-
preempt_enable();
192-
}
193-
194-
static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp)
195-
{
196-
int v = atomic_read(&grp->refcount);
197-
198-
/* workgroup is never freezed on uniprocessor systems */
199-
DBG_BUGON(v == EROFS_LOCKED_MAGIC);
200-
return v;
201-
}
202-
#endif /* !CONFIG_SMP */
203174
#endif /* !CONFIG_EROFS_FS_ZIP */
204175

205176
/* we strictly follow PAGE_SIZE and no buffer head yet */

0 commit comments

Comments
 (0)