Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp4271229pxb; Mon, 25 Oct 2021 00:33:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpq+Hr6ZPxqSlH8A8vI1QJ0miYv9xOe+/0b4ZHqSLRyCfb4OzhlbCsOJzlKCZ6y80VJlHx X-Received: by 2002:a17:906:ca18:: with SMTP id jt24mr20063787ejb.325.1635147219713; Mon, 25 Oct 2021 00:33:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635147219; cv=none; d=google.com; s=arc-20160816; b=02urHfivVvIznitoDbDizJy+FtIElxjih3Lqa3KgzlKLQO0Fk+PzFzbecOTQIhn5uj 1cNdrX6u7UNNyy8Rm/74xAhQcpR5qQEoUU7iRd4IX8axpVyW3J6MKX0mXcsQvmEojvYc 2NZM3Ho8mGXiw1DFrHVx4BokljApKPBBZHeCriczSSUYcOz+oj7G6ORl6n9hBDE59Vbf Jr0XKvAgZJLydtUpQ0X15xTZoAuPFFNKC19k2G3DXR09kuECm9euOMIa4/LFwsZF62OI 3jiYkHzp0lWxvfFKtnzWJnGEwUaRB3L6lFkPo/vFrIMVXB1RPCZHdyNNbs70fsHSvQDI 1d0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=gzXYGlW1oxr6sIDZ9yz/m2BeLPqoL/oEYYiAc26kM0A=; b=zMus6YcRAjKBA/6SA2oQXDAJXWd7cdf0CxOa9Z0Bpun01kJkOYo+seORKdb8GuNAYI 7s2HUSDraZ3QFLd4oqVadT0W8T16T5dSvvF0RUAJts/vEAUmcoOQFj7Xd54R8t5mR79e IDXpBSNvryaQuYxKlZZ9ajoWWfQ+PqLtiJNGi8Ye+PBz51JpH5NtqVysQlLIq385lkOg nFbq3cMp0PzNuhryRvkrihtVEC6RFzI6ZNV83eUWipawIRf+HwQKktd+qQ2Irc7BDPSq BnYdU1On635efvW0cLhylfY+6LPONg+n4b1R6F7SyrqBlV+T69ud07p0BYdQKYacya8U 99WA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mq41si10329553ejc.564.2021.10.25.00.33.11; Mon, 25 Oct 2021 00:33:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231686AbhJYHdY (ORCPT + 99 others); Mon, 25 Oct 2021 03:33:24 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:26193 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231162AbhJYHdX (ORCPT ); Mon, 25 Oct 2021 03:33:23 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Hd66B4KSSz8tv4; Mon, 25 Oct 2021 15:29:38 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Mon, 25 Oct 2021 15:30:58 +0800 Received: from [10.174.178.240] (10.174.178.240) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Mon, 25 Oct 2021 15:30:57 +0800 Subject: Re: [PATCH net 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address To: Oleksij Rempel CC: Robin van der Gracht , Oleksij Rempel , , Oliver Hartkopp , Marc Kleine-Budde , "David S. Miller" , Jakub Kicinski , , , References: <1634825057-47915-1-git-send-email-zhangchangzhong@huawei.com> <1634825057-47915-3-git-send-email-zhangchangzhong@huawei.com> <20211022102306.GB20681@pengutronix.de> From: Zhang Changzhong Message-ID: <9c636d7f-70df-18c9-66ed-46eb21f4ffbb@huawei.com> Date: Mon, 25 Oct 2021 15:30:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20211022102306.GB20681@pengutronix.de> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.178.240] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500006.china.huawei.com (7.185.36.76) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/10/22 18:23, Oleksij Rempel wrote: > On Thu, Oct 21, 2021 at 10:04:16PM +0800, Zhang Changzhong wrote: >> 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") >> Signed-off-by: Zhang Changzhong > > NACK. This will break Address Claiming, where first message is SA == 0xff I know that 0xfe can be used as a source address, but which message has a source address of 0xff? According to SAE-J1939-81 2017 4.2.2.8: The network address 255, also known as the Global address, is permitted in the Destination Address field of the SAE J1939 message identifier but never in the Source Address field. > >> --- >> net/can/j1939/main.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c >> index 08c8606..4f1e4bb 100644 >> --- a/net/can/j1939/main.c >> +++ b/net/can/j1939/main.c >> @@ -75,6 +75,10 @@ static void j1939_can_recv(struct sk_buff *iskb, void *data) >> 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)) >> + /* ignore messages whose sa is broadcast address */ >> + goto done; >> + >> if (j1939_pgn_is_pdu1(skcb->addr.pgn)) { >> /* Type 1: with destination address */ >> skcb->addr.da = skcb->addr.pgn; >> -- >> 2.9.5 >> >> >> >