mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 00:34:20 +08:00
can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM
commit164051a6ab
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:9d71dd0c70
("can: add support of SAE J1939 protocol") Link: https://lore.kernel.org/all/1635431907-15617-4-git-send-email-zhangchangzhong@huawei.com Cc: stable@vger.kernel.org Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e35f3d74bf
commit
24d8a24f56
@ -2023,6 +2023,11 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)
|
||||
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:
|
||||
if (skcb->addr.type != extd)
|
||||
|
Loading…
Reference in New Issue
Block a user