[PATCH net v9 4/4] can: j1939: reject a CTS that names more packets than the message has
From: Chaosheng Qu
Date: Wed Nov 11 2026 - 05:41:09 EST
From: Chaosheng Qu <quchaosheng000406@xxxxxxx>
Reject a CTS packet number above pkt.total in j1939_xtp_rx_cts_one().
The function rejects a zero packet number and a window above pkt.block,
but not a packet number above pkt.total. It then stores "pkt - 1" in
pkt.tx_acked, and the transmitter reports that value back in an
ETP.CM_DPO.
That value is what j1939_xtp_rx_dpo_one() now bounds, so an oversized CTS
is currently caught one step later and reported as a bad EDPO offset.
Reject it where it originates instead, with the abort code that describes
it: J1939_XTP_ABORT_ECTS_TOO_BIG, "ECTS requested packets exceeds message
size".
Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
Cc: stable@xxxxxxxxxxxxxxx
Assisted-by: LLM
Signed-off-by: Chaosheng Qu <quchaosheng000406@xxxxxxx>
---
net/can/j1939/transport.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index fc2840f33..377991d36 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1512,6 +1512,15 @@ j1939_xtp_rx_cts_one(struct j1939_session *session, struct sk_buff *skb)
goto out_session_cancel;
else if (dat[1] > session->pkt.block /* 0xff for etp */)
goto out_session_cancel;
+ else if (pkt > session->pkt.total) {
+ /* The responder asks for more packets than the message has.
+ * pkt - 1 becomes pkt.tx_acked below, and the transmitter
+ * reports that value in an ETP.CM_DPO, where it would name a
+ * packet past the end of the message.
+ */
+ err = J1939_XTP_ABORT_ECTS_TOO_BIG;
+ goto out_session_cancel;
+ }
/* set packet counters only when not CTS(0) */
session->pkt.tx_acked = pkt - 1;
--
2.43.0