lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 159/849] can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport
    Date
    From: Zhang Changzhong <zhangchangzhong@huawei.com>

    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@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>
    ---
    net/can/j1939/transport.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/net/can/j1939/transport.c
    +++ b/net/can/j1939/transport.c
    @@ -2065,6 +2065,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);


    \
     
     \ /
      Last update: 2021-11-15 22:58    [W:4.020 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site