On Thu, Oct 28, 2021 at 10:38:25PM +0800, Zhang Changzhong wrote:
> 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")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
Acked-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
> ---
> net/can/j1939/transport.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
> index 6c0a0eb..05eb3d0 100644
> --- a/net/can/j1939/transport.c
> +++ b/net/can/j1939/transport.c
> @@ -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);
>
> --
> 2.9.5
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
