Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053487; b=bR6YtNkHmoDaQCVABLAlO1PLhsRlA58ZzkLViUAaSqvEWDwsGSB1pwcOK2i4oRw7JREG RhP1hsMv0qwuZ0Uf6U/5/e2v5uqARNbDjd3N9J3vHMe+RzDEKb+ckz/7BuFdpBlh4p7dT 6GdrcYqiU1CbBbX3HhWOmFrsHFZpq7KIZONsoKbchxLcxp0LGtrk3CYW+8EexN7byBHfO WD7E0/RkqWn1rx3l+WiWbbcDvkq/nW4C8jhxjmC7sewv+wivRG12ZWuuaGW4HQPClx418 EyMldMy9MjIrTFlC5pUm6RH9kJ4oIdftazyzEhsREvQi7p3WZIM05oNEfGRhjl2HGsg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053487; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ZOdxQnAQhqzimCVh/WXA7Z2pZJRFgvJNL2Cfke8ANbE=; b=dg2Ab2GwByQ4ucT93rItS9UypGFVVyjNCeayXuT6QU1lO4xa7QuaeKu1lLrp6fxHF8f4 o4/ywZKFBohy3TTnF3Rv6GDesK64+ig8joDI1ee81nZ7tgILGeDSUyHnzzB4DBx+3e1Lc Yg+mxLHr8LOiMFVwVdty1b58q/aHwqV4Svl7WoSvI/X2oZuBhFXWCmF7ansaBudwmWv+Y 3e+SKS198tMwOark+5598V68SLhQuKrXW8DPiA8+wmzrxfR5QF5SDwtwl5MIuC19H+XY5 m2BsSeScuVjDXfi4TN6e0y3QqsLOjTKx2TwSWKoI/PDqbkP5OFb1PMFfNUvHjYW8c+A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MbK5u2LC; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F5DE606A31C; Thu, 19 Nov 2026 01:58:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MbK5u2LC Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5C591F000C4; Thu, 19 Nov 2026 01:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053487; bh=ZOdxQnAQhqzimCVh/WXA7Z2pZJRFgvJNL2Cfke8ANbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MbK5u2LCQeu6EZeg6JxvQasz9WK9FAh7eEZySV4zgQ7B7KkylIhn2rrLYgntb6Quq ysKwEvhGD+v0OwTHv+uvBT6KX6oMvuq+YgtPrp145PJGYDvW0NUkhIUnDd/CSwJrpC b8Eb1D+fFcKHLrelMq33cH894XLJ8kHsOzMiCdp4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Oliver Hartkopp , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 5.15 0897/2214] can: isotp: check the return values of can_rx_register() in isotp_bind() Date: Wed, 18 Nov 2026 15:42:53 +0100 Message-ID: <20261118150048.173014912@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Hartkopp [ Upstream commit 874f5f14cf626f72477071eff381c8485554250d ] isotp_bind() ignores the return values of can_rx_register() for the RX and the echo receiver and binds the socket anyway. When a receiver can not be allocated, bind() succeeds without this receiver, so the socket does not receive frames or its transmissions time out. isotp_release() and isotp_notify() later try to remove the missing receiver, which triggers the "receive list entry not found" warning in can_rx_unregister(). As the device has been checked before and RTNL prevents a namespace change during bind(), only -ENOMEM can be returned here. Check the return values and register the RX receiver as the last step. The echo receiver is registered first, as it only handles the socket's own echo frames and does nothing while no transmission is in progress. So a failed RX registration only needs to remove the echo receiver, and isotp_rcv() has never processed a frame for this socket. Set so->ifindex before the registrations, so that a First Frame received before so->bound is set can be answered with a Flow Control frame and the RX timeout is started as usual. As the RX receiver is registered last, this can only happen for a bind() that succeeds. Reset so->ifindex when bind() fails. Check IFF_UP only after the receivers have been registered, so that a bind() that fails on a down device does not report ENETDOWN. As bind() holds RTNL, the device state can not change in between. Fixes: e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol") Cc: stable@vger.kernel.org Signed-off-by: Oliver Hartkopp Link: https://patch.msgid.link/20261027-can-rx-lock-v12-2-eb5afc2d8b9b@hartkopp.net Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- net/can/isotp.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/net/can/isotp.c b/net/can/isotp.c index 46b71e2bded2c..8832761193634 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1482,7 +1482,6 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) struct sock *sk = sock->sk; struct isotp_sock *so = isotp_sk(sk); struct net *net = sock_net(sk); - int ifindex; struct net_device *dev; canid_t tx_id = addr->can_addr.tp.tx_id; canid_t rx_id = addr->can_addr.tp.rx_id; @@ -1559,26 +1558,36 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) err = -EINVAL; goto out_put_dev; } - if (!(dev->flags & IFF_UP)) - notify_enetdown = 1; - ifindex = dev->ifindex; - - if (isotp_register_rxid(so)) - can_rx_register(net, dev, rx_id, SINGLE_MASK(rx_id), - isotp_rcv, sk, "isotp", sk); + /* switch to new settings */ + so->ifindex = dev->ifindex; + so->rxid = rx_id; + so->txid = tx_id; /* no consecutive frame echo skb in flight */ WRITE_ONCE(so->cfecho, 0); - /* register for echo skb's */ - can_rx_register(net, dev, tx_id, SINGLE_MASK(tx_id), - isotp_rcv_echo, sk, "isotpe", sk); + /* register for echo skb's first (no echo traffic at this point) */ + err = can_rx_register(net, dev, tx_id, SINGLE_MASK(tx_id), + isotp_rcv_echo, sk, "isotpe", sk); + if (err) + goto out_put_dev; + + if (isotp_register_rxid(so)) { + err = can_rx_register(net, dev, rx_id, SINGLE_MASK(rx_id), + isotp_rcv, sk, "isotp", sk); + if (err) { + /* unregister echo skb subscription */ + can_rx_unregister(net, dev, tx_id, SINGLE_MASK(tx_id), + isotp_rcv_echo, sk); + goto out_put_dev; + } + } + + /* report a down device only for a successful bind() */ + if (!(dev->flags & IFF_UP)) + notify_enetdown = 1; - /* switch to new settings */ - so->ifindex = ifindex; - so->rxid = rx_id; - so->txid = tx_id; so->bound = 1; /* bind() ok -> hold a reference for so->dev so that isotp_release() @@ -1589,6 +1598,9 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) dev_hold(so->dev); out_put_dev: + if (err) + so->ifindex = 0; /* reset on failed bind() */ + /* remove potential reference from dev_get_by_index() */ dev_put(dev); out: -- 2.53.0