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.15 129/917] can: j1939: j1939_can_recv(): ignore messages with invalid source address
    Date
    From: Zhang Changzhong <zhangchangzhong@huawei.com>

    commit a79305e156db3d24fcd8eb649cdb3c3b2350e5c2 upstream.

    According to SAE-J1939-82 2015 (A.3.6 Row 2), a receiver should never
    send TP.CM_CTS to the global address, so we can add a check in
    j1939_can_recv() to drop messages with invalid source address.

    Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
    Link: https://lore.kernel.org/all/1635431907-15617-3-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/main.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/net/can/j1939/main.c
    +++ b/net/can/j1939/main.c
    @@ -75,6 +75,13 @@ static void j1939_can_recv(struct sk_buf
    skcb->addr.pgn = (cf->can_id >> 8) & J1939_PGN_MAX;
    /* set default message type */
    skcb->addr.type = J1939_TP;
    +
    + if (!j1939_address_is_valid(skcb->addr.sa)) {
    + netdev_err_once(priv->ndev, "%s: sa is broadcast address, ignoring!\n",
    + __func__);
    + goto done;
    + }
    +
    if (j1939_pgn_is_pdu1(skcb->addr.pgn)) {
    /* Type 1: with destination address */
    skcb->addr.da = skcb->addr.pgn;

    \
     
     \ /
      Last update: 2021-11-16 02:11    [W:2.955 / U:3.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site