Skip to contentSkip to conversation

cve/sctphantom: fix EINVAL on pre-v4.19 kernels

PATCH Applied Andrea Cervesato 4 participants 5 messages Aug 25

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cve/sctphantom: fix EINVAL on pre-v4.19 kernels

From: Andrea Cervesato <[email protected]>

The test passed its 156 byte mirror of struct sctp_paddrparams, which includes the spp_ipv6_flowlabel and spp_dscp tail, to SCTP_PEER_ADDR_PARAMS. Kernels older than v4.19 only accept optlen == sizeof(struct sctp_paddrparams), which is 152 there, so the setsockopt() failed and the test broke:

    sctphantom.c:361: TBROK: setsockopt(6, 132, 9, 0x..., 156) failed: EINVAL (22)

Drop the tail fields from the mirrored struct so that the option length matches the pre-v4.19 layout. That length is also accepted by v4.19 and newer kernels as the compat size introduced along with the tail fields by upstream commit 0b0dce7a36fb ("sctp: add spp_ipv6_flowlabel and spp_dscp for sctp_paddrparams"), provided the SPP_DSCP and SPP_IPV6_FLOWLABEL flags are not set, which the test never does.

Fixes 567528e2f809 ("cve/sctphantom: Add reproducer for CVE-2026-64564")
---
 testcases/cve/sctphantom.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
testcases/cve/sctphantom.c +11 -9
index 9cda48556..a772012e0 100644
@@ -62,17 +62,19 @@
 #define ADDR_DUMMY	"127.0.0.254"	/* third path to keep transport_count > 1 */
 #define ADDR_SPOOF	"127.0.0.3"	/* forged ASCONF packet source */
 
-/* Mirror of the uapi struct sctp_paddrparams */
+/*
+ * Mirror of the uapi struct sctp_paddrparams without the spp_ipv6_flowlabel
+ * and spp_dscp tail added in v4.19: older kernels require optlen == 152,
+ * while v4.19 and newer also accept the pre-v4.19 length.
+ */
 struct tst_sctp_paddrparams {
-	int32_t		spp_assoc_id;
+	int32_t			spp_assoc_id;
 	struct sockaddr_storage	spp_address;
-	uint32_t	spp_hbinterval;
-	uint16_t	spp_pathmaxrxt;
-	uint32_t	spp_pathmtu;
-	uint32_t	spp_sackdelay;
-	uint32_t	spp_flags;
-	uint32_t	spp_ipv6_flowlabel;
-	uint8_t		spp_dscp;
+	uint32_t		spp_hbinterval;
+	uint16_t		spp_pathmaxrxt;
+	uint32_t		spp_pathmtu;
+	uint32_t		spp_sackdelay;
+	uint32_t		spp_flags;
 } __attribute__((packed, aligned(4)));
 
 /* Mirror of the uapi struct sctp_paddrinfo */

---
base-commit: 4c0cfb849f19beed68175de9fb7d02df55987084
change-id: 20260825-sctphantom_fix-efe08b83c6b8

Best regards,

Signature · 5 lines
Andrea Cervesato <[email protected]>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v1 1/1
#2 lore raw
In reply to Andrea Cervesato

Hi Andrea,

Quoted 6 lines

The test passed its 156 byte mirror of struct sctp_paddrparams, which includes the spp_ipv6_flowlabel and spp_dscp tail, to SCTP_PEER_ADDR_PARAMS. Kernels older than v4.19 only accept optlen == sizeof(struct sctp_paddrparams), which is 152 there, so the setsockopt() failed and the test broke:

Quoted 8 lines
    sctphantom.c:361: TBROK: setsockopt(6, 132, 9, 0x..., 156) failed: EINVAL (22)

Drop the tail fields from the mirrored struct so that the option length matches the pre-v4.19 layout. That length is also accepted by v4.19 and newer kernels as the compat size introduced along with the tail fields by upstream commit 0b0dce7a36fb ("sctp: add spp_ipv6_flowlabel and spp_dscp for sctp_paddrparams"), provided the SPP_DSCP and SPP_IPV6_FLOWLABEL flags are not set, which the test never does.

Indeed, it was added in 0b0dce7a36fb ("sctp: add spp_ipv6_flowlabel and spp_dscp for sctp_paddrparams") in v4.19-rc1. Thanks!

Quoted 13 lines
testcases/cve/sctphantom.c +6 -5
-/* Mirror of the uapi struct sctp_paddrparams */
+/*
+ * Mirror of the uapi struct sctp_paddrparams without the spp_ipv6_flowlabel
+ * and spp_dscp tail added in v4.19: older kernels require optlen == 152,
+ * while v4.19 and newer also accept the pre-v4.19 length.
+ */
 struct tst_sctp_paddrparams {
-	int32_t		spp_assoc_id;
+	int32_t			spp_assoc_id;
 	struct sockaddr_storage	spp_address;
-	uint32_t	spp_hbinterval;
-	uint16_t	spp_pathmaxrxt;
-	uint32_t	spp_pathmtu;

testcases/cve/sctphantom.c line 78

Quoted 10 lines
testcases/cve/sctphantom.c +5 -4
-	uint32_t	spp_sackdelay;
-	uint32_t	spp_flags;
-	uint32_t	spp_ipv6_flowlabel;
-	uint8_t		spp_dscp;
+	uint32_t		spp_hbinterval;
+	uint16_t		spp_pathmaxrxt;
+	uint32_t		spp_pathmtu;
+	uint32_t		spp_sackdelay;
+	uint32_t		spp_flags;
 } __attribute__((packed, aligned(4)));

nit: I suppose you copy paste the older struct, which used a different whitespace. But how about (before merge) just remove spp_ipv6_flowlabel and spp_dscp? Without touching whitespace of the other members is change more visible even without using --ignore-space-change.

Kind regards,
Petr

+++ testcases/cve/sctphantom.c
@@ -62,7 +62,11 @@
#define ADDR_DUMMY "127.0.0.254" /* third path to keep transport_count > 1 */
#define ADDR_SPOOF "127.0.0.3" /* forged ASCONF packet source */

-/* Mirror of the uapi struct sctp_paddrparams */
+/*
+ * Mirror of the uapi struct sctp_paddrparams without the spp_ipv6_flowlabel
+ * and spp_dscp tail added in v4.19: older kernels require optlen == 152,
+ * while v4.19 and newer also accept the pre-v4.19 length.
+ */
struct tst_sctp_paddrparams {
int32_t spp_assoc_id;
struct sockaddr_storage spp_address;
@@ -71,8 +75,6 @@ struct tst_sctp_paddrparams {
uint32_t spp_pathmtu;
uint32_t spp_sackdelay;
uint32_t spp_flags;
- uint32_t spp_ipv6_flowlabel;
- uint8_t spp_dscp;
} __attribute__((packed, aligned(4)));

/* Mirror of the uapi struct sctp_paddrinfo */

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw
Quoted 4 lines

nit: I suppose you copy paste the older struct, which used a different whitespace. But how about (before merge) just remove spp_ipv6_flowlabel and spp_dscp? Without touching whitespace of the other members is change more visible even without using --ignore-space-change.

yes indeed, i will fix it before merge. Thanks

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp