From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Zhang Changzhong <zhangchangzhong@huawei.com>
Cc: Robin van der Gracht <robin@protonic.nl>,
linux-kernel@vger.kernel.org,
Oleksij Rempel <linux@rempel-privat.de>,
netdev@vger.kernel.org, Marc Kleine-Budde <mkl@pengutronix.de>,
kernel@pengutronix.de, Oliver Hartkopp <socketcan@hartkopp.net>,
Jakub Kicinski <kuba@kernel.org>,
linux-can@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH net 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address
Date: Thu, 28 Oct 2021 08:51:44 +0200 [thread overview]
Message-ID: <20211028065144.GE20681@pengutronix.de> (raw)
In-Reply-To: <9c636d7f-70df-18c9-66ed-46eb21f4ffbb@huawei.com>
Hi,
On Mon, Oct 25, 2021 at 03:30:57PM +0800, Zhang Changzhong wrote:
> 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 <zhangchangzhong@huawei.com>
> >
> > 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.
You are right. Thx!
Are you using any testing frameworks?
Can you please take a look here:
https://github.com/linux-can/can-tests/tree/master/j1939
We are using this scripts for regression testing of some know bugs.
>
> >
> >> ---
> >> 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;
Please add some warning once message here. We wont to know if something bad
is happening on the bus.
> >> +
> >> if (j1939_pgn_is_pdu1(skcb->addr.pgn)) {
> >> /* Type 1: with destination address */
> >> skcb->addr.da = skcb->addr.pgn;
> >> --
> >> 2.9.5
> >>
> >>
> >>
> >
>
>
Regards,
Oleksij
--
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 |
next prev parent reply other threads:[~2021-10-28 6:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 14:04 [PATCH net 0/3] can: j1939: fix some standard conformance problems Zhang Changzhong
2021-10-21 14:04 ` [PATCH net 1/3] can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport Zhang Changzhong
2021-10-22 9:54 ` Oleksij Rempel
2021-10-22 10:30 ` Oleksij Rempel
2021-10-21 14:04 ` [PATCH net 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address Zhang Changzhong
2021-10-22 10:23 ` Oleksij Rempel
2021-10-25 7:30 ` Zhang Changzhong
2021-10-28 6:51 ` Oleksij Rempel [this message]
2021-10-28 7:33 ` Zhang Changzhong
2021-10-28 8:30 ` Oleksij Rempel
2021-10-21 14:04 ` [PATCH net 3/3] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM Zhang Changzhong
2021-10-22 10:28 ` Oleksij Rempel
2021-10-25 6:59 ` Zhang Changzhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211028065144.GE20681@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rempel-privat.de \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=robin@protonic.nl \
--cc=socketcan@hartkopp.net \
--cc=zhangchangzhong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox