Skip to content

Commit 5ae3e59

Browse files
jainanmol84thefossguy-ciq
authored andcommitted
can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
jira VULN-63435 cve CVE-2021-47459 commit-author Ziyang Xuan <william.xuanziyang@huawei.com> commit d9d52a3 It will trigger UAF for rx_kref of j1939_priv as following. cpu0 cpu1 j1939_sk_bind(socket0, ndev0, ...) j1939_netdev_start j1939_sk_bind(socket1, ndev0, ...) j1939_netdev_start j1939_priv_set j1939_priv_get_by_ndev_locked j1939_jsk_add ..... j1939_netdev_stop kref_put_lock(&priv->rx_kref, ...) kref_get(&priv->rx_kref, ...) REFCOUNT_WARN("addition on 0;...") ==================================================== refcount_t: addition on 0; use-after-free. WARNING: CPU: 1 PID: 20874 at lib/refcount.c:25 refcount_warn_saturate+0x169/0x1e0 RIP: 0010:refcount_warn_saturate+0x169/0x1e0 Call Trace: j1939_netdev_start+0x68b/0x920 j1939_sk_bind+0x426/0xeb0 ? security_socket_bind+0x83/0xb0 The rx_kref's kref_get() and kref_put() should use j1939_netdev_lock to protect. Fixes: 9d71dd0 ("can: add support of SAE J1939 protocol") Link: https://lore.kernel.org/all/20210926104757.2021540-1-william.xuanziyang@huawei.com Cc: stable@vger.kernel.org Reported-by: syzbot+85d9878b19c94f9019ad@syzkaller.appspotmail.com Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit d9d52a3) Signed-off-by: Anmol Jain <ajain@ciq.com>
1 parent 831a84d commit 5ae3e59

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)