Skip to content

Commit 97565a5

Browse files
committed
Merge: CVE-2021-47459: can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4399 ``` JIRA: https://issues.redhat.com/browse/RHEL-38415 CVE: CVE-2021-47459 Commits: can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv  Signed-off-by: Ken Cox <jkc@redhat.com> ``` Approved-by: Radu Rendec <rrendec@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents cf21c98 + 3cacbef commit 97565a5

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

net/can/j1939/main.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,14 @@ struct j1939_priv *j1939_netdev_start(struct net_device *ndev)
253253
struct j1939_priv *priv, *priv_new;
254254
int ret;
255255

256-
priv = j1939_priv_get_by_ndev(ndev);
256+
spin_lock(&j1939_netdev_lock);
257+
priv = j1939_priv_get_by_ndev_locked(ndev);
257258
if (priv) {
258259
kref_get(&priv->rx_kref);
260+
spin_unlock(&j1939_netdev_lock);
259261
return priv;
260262
}
263+
spin_unlock(&j1939_netdev_lock);
261264

262265
priv = j1939_priv_create(ndev);
263266
if (!priv)
@@ -273,10 +276,10 @@ struct j1939_priv *j1939_netdev_start(struct net_device *ndev)
273276
/* Someone was faster than us, use their priv and roll
274277
* back our's.
275278
*/
279+
kref_get(&priv_new->rx_kref);
276280
spin_unlock(&j1939_netdev_lock);
277281
dev_put(ndev);
278282
kfree(priv);
279-
kref_get(&priv_new->rx_kref);
280283
return priv_new;
281284
}
282285
j1939_priv_set(ndev, priv);

0 commit comments

Comments
 (0)