Unverified Commit c9fe32fe authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11844 fix CVE-2024-46771 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RYO4CFIUQZ22FYNOMQC5EI6MRWVCMFHC/ 
Kuniyuki Iwashima (2):
  can: bcm: Remove proc entry when dev is unregistered.
  can: bcm: Clear bo->bcm_proc_read after remove_proc_entry().


-- 
2.9.5
 
https://gitee.com/src-openeuler/kernel/issues/IARWDZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/11844

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents bde3235c 4dabe115

net/can/bcm.c

+6 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,12 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg, 


		/* remove device reference, if this is our bound device */

		if (bo->bound && bo->ifindex == dev->ifindex) {

#if IS_ENABLED(CONFIG_PROC_FS)

			if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) {

				remove_proc_entry(bo->procname, sock_net(sk)->can.bcmproc_dir);

				bo->bcm_proc_read = NULL;

			}

#endif

			bo->bound   = 0;

			bo->ifindex = 0;

			notify_enodev = 1;