| Message ID | 1634825057-47915-4-git-send-email-zhangchangzhong@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | can: j1939: fix some standard conformance problems | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Series has a cover letter |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 9 of 9 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | No static functions without inline keyword in header files |
On Thu, Oct 21, 2021 at 10:04:17PM +0800, Zhang Changzhong wrote: > 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 tranport: > 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") > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > --- > net/can/j1939/transport.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c > index 2efa606..93ec0c3 100644 > --- a/net/can/j1939/transport.c > +++ b/net/can/j1939/transport.c > @@ -2019,6 +2019,8 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) > extd = J1939_ETP; > fallthrough; > case J1939_TP_CMD_BAM: > + if (!j1939_cb_is_broadcast(skcb)) Please add here netdev_err_once("with some message"), we need to know if some MCU makes bad things. > + return; > fallthrough; > case J1939_TP_CMD_RTS: > if (skcb->addr.type != extd) > -- > 2.9.5 > >
On 2021/10/22 18:28, Oleksij Rempel wrote: > On Thu, Oct 21, 2021 at 10:04:17PM +0800, Zhang Changzhong wrote: >> 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 tranport: >> 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") >> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> >> --- >> net/can/j1939/transport.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c >> index 2efa606..93ec0c3 100644 >> --- a/net/can/j1939/transport.c >> +++ b/net/can/j1939/transport.c >> @@ -2019,6 +2019,8 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) >> extd = J1939_ETP; >> fallthrough; >> case J1939_TP_CMD_BAM: >> + if (!j1939_cb_is_broadcast(skcb)) > > Please add here netdev_err_once("with some message"), we need to know if > some MCU makes bad things. Ok, will do. The current patch breaks ETP functionality as the J1939_ETP_CMD_RTS fallthrough to J1939_TP_CMD_BAM, this will also be fixed in v2. > >> + return; >> fallthrough; >> case J1939_TP_CMD_RTS: >> if (skcb->addr.type != extd) >> -- >> 2.9.5 >> >> >
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 2efa606..93ec0c3 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -2019,6 +2019,8 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) extd = J1939_ETP; fallthrough; case J1939_TP_CMD_BAM: + if (!j1939_cb_is_broadcast(skcb)) + return; fallthrough; case J1939_TP_CMD_RTS: if (skcb->addr.type != extd)
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 tranport: 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") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- net/can/j1939/transport.c | 2 ++ 1 file changed, 2 insertions(+)