Skip to content

Commit

Permalink
can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM tran…
Browse files Browse the repository at this point in the history
…sport

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: 9d71dd0 ("can: add support of SAE J1939 protocol")
Link: https://lore.kernel.org/all/1635431907-15617-2-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>
  • Loading branch information
Zhang Changzhong authored and marckleinebudde committed Nov 6, 2021
1 parent 70bf363 commit c0f49d9
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions net/can/j1939/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,12 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)
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);

Expand Down

0 comments on commit c0f49d9

Please sign in to comment.