Merge: CVE-2023-52922 can: bcm: Fix UAF in bcm_proc_show() [rhel-9.6]

MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/3455

JIRA: https://issues.redhat.com/browse/RHEL-80748
CVE: CVE-2023-52922

Signed-off-by: Michal Schmidt <[email protected]>

Approved-by: Radu Rendec <[email protected]>
Approved-by: Marc Milgram <[email protected]>
Approved-by: CKI KWF Bot <[email protected]>

Merged-by: CKI KWF Bot <[email protected]>

Author: CKI KWF Bot

net/can/bcm.c

@@ -1511,6 +1511,12 @@ static int bcm_release(struct socket *sock)
 
 	lock_sock(sk);
 
+#if IS_ENABLED(CONFIG_PROC_FS)
+	/* remove procfs entry */
+	if (net->can.bcmproc_dir && bo->bcm_proc_read)
+		remove_proc_entry(bo->procname, net->can.bcmproc_dir);
+#endif /* CONFIG_PROC_FS */
+
 	list_for_each_entry_safe(op, next, &bo->tx_ops, list)
 		bcm_remove_op(op);
 
@@ -1546,12 +1552,6 @@ static int bcm_release(struct socket *sock)
 	list_for_each_entry_safe(op, next, &bo->rx_ops, list)
 		bcm_remove_op(op);
 
-#if IS_ENABLED(CONFIG_PROC_FS)
-	/* remove procfs entry */
-	if (net->can.bcmproc_dir && bo->bcm_proc_read)
-		remove_proc_entry(bo->procname, net->can.bcmproc_dir);
-#endif /* CONFIG_PROC_FS */
-
 	/* remove device reference */
 	if (bo->bound) {
 		bo->bound   = 0;