From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8A111BD4EA; Tue, 2 Jul 2024 17:34:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941682; cv=none; b=g3rmk9d+2812V5KgkNdhl730R7wAKyFcW7JDX8qfcJzv0VuLmo6TQOK0WmpkN5gE4NMzxF6ldzMEBd1+wWVZtGGQNTrseWKWlYHIqQxu8O1+57LILeck2RswIdrNqD7wCZKb0+bHT103gIOy2xJKfvZPVSac5bIG4bzX8+M2CTk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941682; c=relaxed/simple; bh=laWbhqiTB+EovDO8vpZ9q6ojOCaT2T9jI9CPZsfTHQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q7AeFpTsH9cwuJY+iGNqlqGdvgL9FmcEKWlNqTQJSg/x0fiRI4QPAHJVtsKrVzPSEgk5EIzWoOLPl7Vw7BoldBW2tihi8u6k+PKmOVo0E6SzOeBj6ii8RsrQ+rlIwXzJozwgy/Q53dxISqKcZ4fVhuk/ylSke4YHvHSHf3W54y4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VnrSpygc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VnrSpygc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9FBFC116B1; Tue, 2 Jul 2024 17:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719941682; bh=laWbhqiTB+EovDO8vpZ9q6ojOCaT2T9jI9CPZsfTHQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VnrSpygcOZtf0DEzptjojgZD989uXrRuQrGOYETwqTWjgOuGwcBBZ1KKPqU5k59Ij HnyX89xYrUqQ4oDzWtQPPZXipeghQMSahacg9wvSNDUFqpWl94AZWTZA4a+7Qq7lAr BUc7fAR1U1VVs6b6FOd/byAxOSUaV3aP3ugK12XY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Alexander=20H=C3=B6lzl?= , Oleksij Rempel , Marc Kleine-Budde Subject: [PATCH 6.1 095/128] net: can: j1939: recover socket queue on CAN bus error during BAM transmission Date: Tue, 2 Jul 2024 19:04:56 +0200 Message-ID: <20240702170229.813330392@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170226.231899085@linuxfoundation.org> References: <20240702170226.231899085@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oleksij Rempel commit 9ad1da14ab3bf23087ae45fe399d84a109ddb81a upstream. Addresses an issue where a CAN bus error during a BAM transmission could stall the socket queue, preventing further transmissions even after the bus error is resolved. The fix activates the next queued session after the error recovery, allowing communication to continue. Fixes: 9d71dd0c70099 ("can: add support of SAE J1939 protocol") Cc: stable@vger.kernel.org Reported-by: Alexander Hölzl Tested-by: Alexander Hölzl Signed-off-by: Oleksij Rempel Link: https://lore.kernel.org/all/20240528070648.1947203-1-o.rempel@pengutronix.de Cc: stable@vger.kernel.org Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- net/can/j1939/transport.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1681,6 +1681,8 @@ static int j1939_xtp_rx_rts_session_acti j1939_session_timers_cancel(session); j1939_session_cancel(session, J1939_XTP_ABORT_BUSY); + if (session->transmission) + j1939_session_deactivate_activate_next(session); return -EBUSY; }