This is a note to let you know that I've just added the patch titled can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM to the 5.10-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-check-the-dst-address-of-tp.cm_bam.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 164051a6ab5445bd97f719f50b16db8b32174269 Mon Sep 17 00:00:00 2001 From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx> Date: Thu, 28 Oct 2021 22:38:27 +0800 Subject: can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx> commit 164051a6ab5445bd97f719f50b16db8b32174269 upstream. The TP.CM_BAM message must be sent to the global address [1], so add a check to drop TP.CM_BAM sent to a non-global address. Without this patch, the receiver will treat the following packets as normal RTS/CTS transport: 18EC0102#20090002FF002301 18EB0102#0100000000000000 18EB0102#020000FFFFFFFFFF [1] SAE-J1939-82 2015 A.3.3 Row 1. Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Link: https://lore.kernel.org/all/1635431907-15617-4-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 @@ -2004,6 +2004,12 @@ static void j1939_tp_cmd_recv(struct j19 extd = J1939_ETP; fallthrough; case J1939_TP_CMD_BAM: + if (cmd == J1939_TP_CMD_BAM && !j1939_cb_is_broadcast(skcb)) { + netdev_err_once(priv->ndev, "%s: BAM to unicast (%02x), ignoring!\n", + __func__, skcb->addr.sa); + return; + } + fallthrough; case J1939_TP_CMD_RTS: /* fall through */ if (skcb->addr.type != extd) return; Patches currently in stable-queue which might be from zhangchangzhong@xxxxxxxxxx are queue-5.10/can-j1939-j1939_tp_cmd_recv-check-the-dst-address-of-tp.cm_bam.patch