Commit 06e02da2 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Marc Kleine-Budde
Browse files

can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails 



Since j1939_sk_bind() and j1939_sk_release() call j1939_local_ecu_put()
when J1939_SOCK_BOUND was already set, but the error handling path for
j1939_sk_bind() will not set J1939_SOCK_BOUND when j1939_local_ecu_get()
fails, j1939_local_ecu_get() needs to undo priv->ents[sa].nusers++ when
j1939_local_ecu_get() returns an error.

Fixes: 9d71dd0c ("can: add support of SAE J1939 protocol")
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tested-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Acked-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/e7f80046-4ff7-4ce2-8ad8-7c3c678a42c9@I-love.SAKURA.ne.jp


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent f214744c

net/can/j1939/bus.c

+4 −1
Original line number Diff line number Diff line
@@ -290,8 +290,11 @@ int j1939_local_ecu_get(struct j1939_priv *priv, name_t name, u8 sa) 
	if (!ecu)

		ecu = j1939_ecu_create_locked(priv, name);

	err = PTR_ERR_OR_ZERO(ecu);

	if (err)

	if (err) {

		if (j1939_address_is_unicast(sa))

			priv->ents[sa].nusers--;

		goto done;

	}



	ecu->nusers++;

	/* TODO: do we care if ecu->addr != sa? */