This is a note to let you know that I've just added the patch titled can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: can-j1939-j1939_tp_cmd_recv-ignore-abort-message-in-the-bam-transport.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From c0f49d98006f2db3333b917caac65bce2af9865c Mon Sep 17 00:00:00 2001 From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx> Date: Thu, 28 Oct 2021 22:38:25 +0800 Subject: can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx> commit c0f49d98006f2db3333b917caac65bce2af9865c upstream. This patch prevents BAM transport from being closed by receiving abort message, as specified in SAE-J1939-82 2015 (A.3.3 Row 4). Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Link: https://lore.kernel.org/all/1635431907-15617-2-git-send-email-zhangchangzhong@xxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx> Acked-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/can/j1939/transport.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -2085,6 +2085,12 @@ static void j1939_tp_cmd_recv(struct j19 break; case J1939_ETP_CMD_ABORT: /* && J1939_TP_CMD_ABORT */ + if (j1939_cb_is_broadcast(skcb)) { + netdev_err_once(priv->ndev, "%s: abort to broadcast (%02x), ignoring!\n", + __func__, skcb->addr.sa); + return; + } + if (j1939_tp_im_transmitter(skcb)) j1939_xtp_rx_abort(priv, skb, true); Patches currently in stable-queue which might be from zhangchangzhong@xxxxxxxxxx are queue-5.15/can-j1939-j1939_tp_cmd_recv-ignore-abort-message-in-the-bam-transport.patch queue-5.15/can-j1939-j1939_tp_cmd_recv-check-the-dst-address-of-tp.cm_bam.patch queue-5.15/can-j1939-j1939_can_recv-ignore-messages-with-invalid-source-address.patch