From: Zhang Changzhong <zhangchangzhong@huawei.com>
To: Robin van der Gracht <robin@protonic.nl>,
Oleksij Rempel <linux@rempel-privat.de>, <kernel@pengutronix.de>,
Oliver Hartkopp <socketcan@hartkopp.net>,
Marc Kleine-Budde <mkl@pengutronix.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Zhang Changzhong <zhangchangzhong@huawei.com>,
<linux-can@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH net 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address
Date: Thu, 21 Oct 2021 22:04:16 +0800 [thread overview]
Message-ID: <1634825057-47915-3-git-send-email-zhangchangzhong@huawei.com> (raw)
In-Reply-To: <1634825057-47915-1-git-send-email-zhangchangzhong@huawei.com>
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>
---
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
next prev parent reply other threads:[~2021-10-21 13:54 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 ` Zhang Changzhong [this message]
2021-10-22 10:23 ` [PATCH net 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address Oleksij Rempel
2021-10-25 7:30 ` Zhang Changzhong
2021-10-28 6:51 ` Oleksij Rempel
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=1634825057-47915-3-git-send-email-zhangchangzhong@huawei.com \
--to=zhangchangzhong@huawei.com \
--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 \
/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;
as well as URLs for NNTP newsgroup(s).