From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Zhang Changzhong <zhangchangzhong@huawei.com>
Cc: 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>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net v2 1/3] can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport
Date: Wed, 3 Nov 2021 14:23:21 +0100 [thread overview]
Message-ID: <20211103132321.GK20681@pengutronix.de> (raw)
In-Reply-To: <1635431907-15617-2-git-send-email-zhangchangzhong@huawei.com>
On Thu, Oct 28, 2021 at 10:38:25PM +0800, Zhang Changzhong wrote:
> 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")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> net/can/j1939/transport.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
> index 6c0a0eb..05eb3d0 100644
> --- a/net/can/j1939/transport.c
> +++ b/net/can/j1939/transport.c
> @@ -2085,6 +2085,12 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)
> 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);
>
> --
> 2.9.5
>
>
--
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-11-03 13:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 14:38 [PATCH net v2 0/3] can: j1939: fix some standard conformance problems Zhang Changzhong
2021-10-28 14:38 ` [PATCH net v2 1/3] can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport Zhang Changzhong
2021-11-03 13:23 ` Oleksij Rempel [this message]
2021-10-28 14:38 ` [PATCH net v2 2/3] can: j1939: j1939_can_recv(): ignore messages with invalid source address Zhang Changzhong
2021-11-03 13:24 ` Oleksij Rempel
2021-10-28 14:38 ` [PATCH net v2 3/3] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM Zhang Changzhong
2021-11-03 13:26 ` Oleksij Rempel
2021-11-06 16:26 ` [PATCH net v2 0/3] can: j1939: fix some standard conformance problems Marc Kleine-Budde
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=20211103132321.GK20681@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;
as well as URLs for NNTP newsgroup(s).