Skip to content

Commit d9e144d

Browse files
can: bcm: Fix UAF in bcm_proc_show()
jira VULN-36332 cve CVE-2023-52922 commit-author YueHaibing <[email protected]> commit 55c3b96 BUG: KASAN: slab-use-after-free in bcm_proc_show+0x969/0xa80 Read of size 8 at addr ffff888155846230 by task cat/7862 CPU: 1 PID: 7862 Comm: cat Not tainted 6.5.0-rc1-00153-gc8746099c197 ctrliq#230 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0xd5/0x150 print_report+0xc1/0x5e0 kasan_report+0xba/0xf0 bcm_proc_show+0x969/0xa80 seq_read_iter+0x4f6/0x1260 seq_read+0x165/0x210 proc_reg_read+0x227/0x300 vfs_read+0x1d5/0x8d0 ksys_read+0x11e/0x240 do_syscall_64+0x35/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Allocated by task 7846: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x9e/0xa0 bcm_sendmsg+0x264b/0x44e0 sock_sendmsg+0xda/0x180 ____sys_sendmsg+0x735/0x920 ___sys_sendmsg+0x11d/0x1b0 __sys_sendmsg+0xfa/0x1d0 do_syscall_64+0x35/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 7846: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x27/0x40 ____kasan_slab_free+0x161/0x1c0 slab_free_freelist_hook+0x119/0x220 __kmem_cache_free+0xb4/0x2e0 rcu_core+0x809/0x1bd0 bcm_op is freed before procfs entry be removed in bcm_release(), this lead to bcm_proc_show() may read the freed bcm_op. Fixes: ffd980f ("[CAN]: Add broadcast manager (bcm) protocol") Signed-off-by: YueHaibing <[email protected]> Reviewed-by: Oliver Hartkopp <[email protected]> Acked-by: Oliver Hartkopp <[email protected]> Link: https://lore.kernel.org/all/[email protected] Cc: [email protected] Signed-off-by: Marc Kleine-Budde <[email protected]> (cherry picked from commit 55c3b96) Signed-off-by: Pratham Patel <[email protected]>
1 parent bdb00b4 commit d9e144d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

net/can/bcm.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,12 @@ static int bcm_release(struct socket *sock)
15031503

15041504
lock_sock(sk);
15051505

1506+
#if IS_ENABLED(CONFIG_PROC_FS)
1507+
/* remove procfs entry */
1508+
if (net->can.bcmproc_dir && bo->bcm_proc_read)
1509+
remove_proc_entry(bo->procname, net->can.bcmproc_dir);
1510+
#endif /* CONFIG_PROC_FS */
1511+
15061512
list_for_each_entry_safe(op, next, &bo->tx_ops, list)
15071513
bcm_remove_op(op);
15081514

@@ -1538,12 +1544,6 @@ static int bcm_release(struct socket *sock)
15381544
list_for_each_entry_safe(op, next, &bo->rx_ops, list)
15391545
bcm_remove_op(op);
15401546

1541-
#if IS_ENABLED(CONFIG_PROC_FS)
1542-
/* remove procfs entry */
1543-
if (net->can.bcmproc_dir && bo->bcm_proc_read)
1544-
remove_proc_entry(bo->procname, net->can.bcmproc_dir);
1545-
#endif /* CONFIG_PROC_FS */
1546-
15471547
/* remove device reference */
15481548
if (bo->bound) {
15491549
bo->bound = 0;

0 commit comments

Comments
 (0)