| Message ID | 1635431907-15617-2-git-send-email-zhangchangzhong@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| 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, 12 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 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 > >
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);
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> --- net/can/j1939/transport.c | 6 ++++++ 1 file changed, 6 insertions(+)