Skip to content

Commit 2d8836f

Browse files
Tetsuo Handagregkh
authored andcommitted
can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed
[ Upstream commit f214744 ] Commit 25fe97c ("can: j1939: move j1939_priv_put() into sk_destruct callback") expects that a call to j1939_priv_put() can be unconditionally delayed until j1939_sk_sock_destruct() is called. But a refcount leak will happen when j1939_sk_bind() is called again after j1939_local_ecu_get() from previous j1939_sk_bind() call returned an error. We need to call j1939_priv_put() before j1939_sk_bind() returns an error. Fixes: 25fe97c ("can: j1939: move j1939_priv_put() into sk_destruct callback") Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Tested-by: Oleksij Rempel <o.rempel@pengutronix.de> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Link: https://patch.msgid.link/4f49a1bc-a528-42ad-86c0-187268ab6535@I-love.SAKURA.ne.jp Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent b905b2a commit 2d8836f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/can/j1939/socket.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,9 @@ static int j1939_sk_bind(struct socket *sock, struct sockaddr *uaddr, int len)
520520
ret = j1939_local_ecu_get(priv, jsk->addr.src_name, jsk->addr.sa);
521521
if (ret) {
522522
j1939_netdev_stop(priv);
523+
jsk->priv = NULL;
524+
synchronize_rcu();
525+
j1939_priv_put(priv);
523526
goto out_release_sock;
524527
}
525528

0 commit comments

Comments
 (0)