* [PATCH v1] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM
@ 2021-12-01 10:25 Oleksij Rempel
2021-12-02 15:35 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Oleksij Rempel @ 2021-12-01 10:25 UTC (permalink / raw)
To: stable; +Cc: Zhang Changzhong, Oleksij Rempel, Marc Kleine-Budde
From: Zhang Changzhong <zhangchangzhong@huawei.com>
commit 164051a6ab5445bd97f719f50b16db8b32174269 upstream.
The TP.CM_BAM message must be sent to the global address [1], so add a
check to drop TP.CM_BAM sent to a non-global address.
Without this patch, the receiver will treat the following packets as
normal RTS/CTS transport:
18EC0102#20090002FF002301
18EB0102#0100000000000000
18EB0102#020000FFFFFFFFFF
[1] SAE-J1939-82 2015 A.3.3 Row 1.
Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
Link: https://lore.kernel.org/all/1635431907-15617-4-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>
---
changes:
- rebase against v5.10.82
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 fe35fdad35c9..9c39b0f5d6e0 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -2004,6 +2004,12 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)
extd = J1939_ETP;
fallthrough;
case J1939_TP_CMD_BAM:
+ if (cmd == J1939_TP_CMD_BAM && !j1939_cb_is_broadcast(skcb)) {
+ netdev_err_once(priv->ndev, "%s: BAM to unicast (%02x), ignoring!\n",
+ __func__, skcb->addr.sa);
+ return;
+ }
+ fallthrough;
case J1939_TP_CMD_RTS: /* fall through */
if (skcb->addr.type != extd)
return;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM
2021-12-01 10:25 [PATCH v1] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM Oleksij Rempel
@ 2021-12-02 15:35 ` Greg KH
2021-12-02 15:54 ` Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2021-12-02 15:35 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: stable, Zhang Changzhong, Marc Kleine-Budde
On Wed, Dec 01, 2021 at 11:25:49AM +0100, Oleksij Rempel wrote:
> From: Zhang Changzhong <zhangchangzhong@huawei.com>
>
> commit 164051a6ab5445bd97f719f50b16db8b32174269 upstream.
>
> The TP.CM_BAM message must be sent to the global address [1], so add a
> check to drop TP.CM_BAM sent to a non-global address.
>
> Without this patch, the receiver will treat the following packets as
> normal RTS/CTS transport:
> 18EC0102#20090002FF002301
> 18EB0102#0100000000000000
> 18EB0102#020000FFFFFFFFFF
>
> [1] SAE-J1939-82 2015 A.3.3 Row 1.
>
> Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> Link: https://lore.kernel.org/all/1635431907-15617-4-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>
> ---
> changes:
> - rebase against v5.10.82
Now queued up, thanks! Can you also do this for 5.4.y?
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM
2021-12-02 15:35 ` Greg KH
@ 2021-12-02 15:54 ` Marc Kleine-Budde
0 siblings, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2021-12-02 15:54 UTC (permalink / raw)
To: Greg KH; +Cc: Oleksij Rempel, stable, Zhang Changzhong
[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]
On 02.12.2021 16:35:43, Greg KH wrote:
> On Wed, Dec 01, 2021 at 11:25:49AM +0100, Oleksij Rempel wrote:
> > From: Zhang Changzhong <zhangchangzhong@huawei.com>
> >
> > commit 164051a6ab5445bd97f719f50b16db8b32174269 upstream.
> >
> > The TP.CM_BAM message must be sent to the global address [1], so add a
> > check to drop TP.CM_BAM sent to a non-global address.
> >
> > Without this patch, the receiver will treat the following packets as
> > normal RTS/CTS transport:
> > 18EC0102#20090002FF002301
> > 18EB0102#0100000000000000
> > 18EB0102#020000FFFFFFFFFF
> >
> > [1] SAE-J1939-82 2015 A.3.3 Row 1.
> >
> > Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> > Link: https://lore.kernel.org/all/1635431907-15617-4-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>
> > ---
> > changes:
> > - rebase against v5.10.82
>
> Now queued up, thanks! Can you also do this for 5.4.y?
Here you go:
https://lore.kernel.org/all/20211202155256.2405492-1-mkl@pengutronix.de
Thanks,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-02 15:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 10:25 [PATCH v1] can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM Oleksij Rempel
2021-12-02 15:35 ` Greg KH
2021-12-02 15:54 ` Marc Kleine-Budde
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).