Blame SOURCES/0056-extensions-sctp-Translate-chunk-types-option.patch

082114
From 48f38c4224f31d19176df83539501292fcc6092b Mon Sep 17 00:00:00 2001
082114
From: Phil Sutter <phil@nwl.cc>
082114
Date: Tue, 4 May 2021 16:26:42 +0200
082114
Subject: [PATCH] extensions: sctp: Translate --chunk-types option
082114
082114
The translation is not fully complete as it is not possible to map 'any'
082114
match type into nft syntax with a single rule. Also, 'only' match type
082114
translation is a bit poor as it explicitly lists all chunk types that
082114
are supposed to be missing.
082114
082114
Signed-off-by: Phil Sutter <phil@nwl.cc>
082114
(cherry picked from commit 5818be177110a09120dd8fe4bd2533acbf8da301)
082114
---
082114
 extensions/libxt_sctp.c      | 91 ++++++++++++++++++++++++++++--------
082114
 extensions/libxt_sctp.txlate |  6 +++
082114
 2 files changed, 78 insertions(+), 19 deletions(-)
082114
082114
diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
082114
index ee4e99ebf11bf..5d8ab85cacf42 100644
082114
--- a/extensions/libxt_sctp.c
082114
+++ b/extensions/libxt_sctp.c
082114
@@ -92,28 +92,29 @@ struct sctp_chunk_names {
082114
 	const char *name;
082114
 	unsigned int chunk_type;
082114
 	const char *valid_flags;
082114
+	const char *nftname;
082114
 };
082114
 
082114
 /*'ALL' and 'NONE' will be treated specially. */
082114
 static const struct sctp_chunk_names sctp_chunk_names[]
082114
-= { { .name = "DATA", 		.chunk_type = 0,   .valid_flags = "----IUBE"},
082114
-    { .name = "INIT", 		.chunk_type = 1,   .valid_flags = "--------"},
082114
-    { .name = "INIT_ACK", 	.chunk_type = 2,   .valid_flags = "--------"},
082114
-    { .name = "SACK",		.chunk_type = 3,   .valid_flags = "--------"},
082114
-    { .name = "HEARTBEAT",	.chunk_type = 4,   .valid_flags = "--------"},
082114
-    { .name = "HEARTBEAT_ACK",	.chunk_type = 5,   .valid_flags = "--------"},
082114
-    { .name = "ABORT",		.chunk_type = 6,   .valid_flags = "-------T"},
082114
-    { .name = "SHUTDOWN",	.chunk_type = 7,   .valid_flags = "--------"},
082114
-    { .name = "SHUTDOWN_ACK",	.chunk_type = 8,   .valid_flags = "--------"},
082114
-    { .name = "ERROR",		.chunk_type = 9,   .valid_flags = "--------"},
082114
-    { .name = "COOKIE_ECHO",	.chunk_type = 10,  .valid_flags = "--------"},
082114
-    { .name = "COOKIE_ACK",	.chunk_type = 11,  .valid_flags = "--------"},
082114
-    { .name = "ECN_ECNE",	.chunk_type = 12,  .valid_flags = "--------"},
082114
-    { .name = "ECN_CWR",	.chunk_type = 13,  .valid_flags = "--------"},
082114
-    { .name = "SHUTDOWN_COMPLETE", .chunk_type = 14,  .valid_flags = "-------T"},
082114
-    { .name = "ASCONF",		.chunk_type = 193,  .valid_flags = "--------"},
082114
-    { .name = "ASCONF_ACK",	.chunk_type = 128,  .valid_flags = "--------"},
082114
-    { .name = "FORWARD_TSN",	.chunk_type = 192,  .valid_flags = "--------"},
082114
+= { { .name = "DATA", 		.chunk_type = 0,   .valid_flags = "----IUBE", .nftname = "data" },
082114
+    { .name = "INIT", 		.chunk_type = 1,   .valid_flags = "--------", .nftname = "init" },
082114
+    { .name = "INIT_ACK", 	.chunk_type = 2,   .valid_flags = "--------", .nftname = "init-ack" },
082114
+    { .name = "SACK",		.chunk_type = 3,   .valid_flags = "--------", .nftname = "sack" },
082114
+    { .name = "HEARTBEAT",	.chunk_type = 4,   .valid_flags = "--------", .nftname = "heartbeat" },
082114
+    { .name = "HEARTBEAT_ACK",	.chunk_type = 5,   .valid_flags = "--------", .nftname = "heartbeat-ack" },
082114
+    { .name = "ABORT",		.chunk_type = 6,   .valid_flags = "-------T", .nftname = "abort" },
082114
+    { .name = "SHUTDOWN",	.chunk_type = 7,   .valid_flags = "--------", .nftname = "shutdown" },
082114
+    { .name = "SHUTDOWN_ACK",	.chunk_type = 8,   .valid_flags = "--------", .nftname = "shutdown-ack" },
082114
+    { .name = "ERROR",		.chunk_type = 9,   .valid_flags = "--------", .nftname = "error" },
082114
+    { .name = "COOKIE_ECHO",	.chunk_type = 10,  .valid_flags = "--------", .nftname = "cookie-echo" },
082114
+    { .name = "COOKIE_ACK",	.chunk_type = 11,  .valid_flags = "--------", .nftname = "cookie-ack" },
082114
+    { .name = "ECN_ECNE",	.chunk_type = 12,  .valid_flags = "--------", .nftname = "ecne" },
082114
+    { .name = "ECN_CWR",	.chunk_type = 13,  .valid_flags = "--------", .nftname = "cwr" },
082114
+    { .name = "SHUTDOWN_COMPLETE", .chunk_type = 14,  .valid_flags = "-------T", .nftname = "shutdown-complete" },
082114
+    { .name = "ASCONF",		.chunk_type = 193,  .valid_flags = "--------", .nftname = "asconf" },
082114
+    { .name = "ASCONF_ACK",	.chunk_type = 128,  .valid_flags = "--------", .nftname = "asconf-ack" },
082114
+    { .name = "FORWARD_TSN",	.chunk_type = 192,  .valid_flags = "--------", .nftname = "forward-tsn" },
082114
 };
082114
 
082114
 static void
082114
@@ -485,12 +486,52 @@ static void sctp_save(const void *ip, const struct xt_entry_match *match)
082114
 	}
082114
 }
082114
 
082114
+static const char *sctp_xlate_chunk(struct xt_xlate *xl, const char *space,
082114
+				    const struct xt_sctp_info *einfo,
082114
+				    const struct sctp_chunk_names *scn)
082114
+{
082114
+	bool inv = einfo->invflags & XT_SCTP_CHUNK_TYPES;
082114
+	const struct xt_sctp_flag_info *flag_info = NULL;
082114
+	int i;
082114
+
082114
+	if (!scn->nftname)
082114
+		return space;
082114
+
082114
+	if (!SCTP_CHUNKMAP_IS_SET(einfo->chunkmap, scn->chunk_type)) {
082114
+		if (einfo->chunk_match_type != SCTP_CHUNK_MATCH_ONLY)
082114
+			return space;
082114
+
082114
+		xt_xlate_add(xl, "%ssctp chunk %s %s", space,
082114
+			     scn->nftname, inv ? "exists" : "missing");
082114
+		return " ";
082114
+	}
082114
+
082114
+	for (i = 0; i < einfo->flag_count; i++) {
082114
+		if (einfo->flag_info[i].chunktype == scn->chunk_type) {
082114
+			flag_info = &einfo->flag_info[i];
082114
+			break;
082114
+		}
082114
+	}
082114
+
082114
+	if (!flag_info) {
082114
+		xt_xlate_add(xl, "%ssctp chunk %s %s", space,
082114
+			     scn->nftname, inv ? "missing" : "exists");
082114
+		return " ";
082114
+	}
082114
+
082114
+	xt_xlate_add(xl, "%ssctp chunk %s flags & 0x%x %s 0x%x", space,
082114
+		     scn->nftname, flag_info->flag_mask,
082114
+		     inv ? "!=" : "==", flag_info->flag);
082114
+
082114
+	return " ";
082114
+}
082114
+
082114
 static int sctp_xlate(struct xt_xlate *xl,
082114
 		      const struct xt_xlate_mt_params *params)
082114
 {
082114
 	const struct xt_sctp_info *einfo =
082114
 		(const struct xt_sctp_info *)params->match->data;
082114
-	char *space = "";
082114
+	const char *space = "";
082114
 
082114
 	if (!einfo->flags)
082114
 		return 0;
082114
@@ -516,6 +557,18 @@ static int sctp_xlate(struct xt_xlate *xl,
082114
 			xt_xlate_add(xl, "%ssctp dport%s %u", space,
082114
 				     einfo->invflags & XT_SCTP_DEST_PORTS ? " !=" : "",
082114
 				     einfo->dpts[0]);
082114
+		space = " ";
082114
+	}
082114
+
082114
+	if (einfo->flags & XT_SCTP_CHUNK_TYPES) {
082114
+		int i;
082114
+
082114
+		if (einfo->chunk_match_type == SCTP_CHUNK_MATCH_ANY)
082114
+			return 0;
082114
+
082114
+		for (i = 0; i < ARRAY_SIZE(sctp_chunk_names); i++)
082114
+			space = sctp_xlate_chunk(xl, space, einfo,
082114
+						 &sctp_chunk_names[i]);
082114
 	}
082114
 
082114
 	return 1;
082114
diff --git a/extensions/libxt_sctp.txlate b/extensions/libxt_sctp.txlate
082114
index 0d6c59e183675..bb817525db8d8 100644
082114
--- a/extensions/libxt_sctp.txlate
082114
+++ b/extensions/libxt_sctp.txlate
082114
@@ -36,3 +36,9 @@ nft add rule ip filter INPUT sctp sport 50 sctp dport != 80-100 counter accept
082114
 
082114
 iptables-translate -A INPUT -p sctp --dport 80 ! --sport 50:55 -j ACCEPT
082114
 nft add rule ip filter INPUT sctp sport != 50-55 sctp dport 80 counter accept
082114
+
082114
+iptables-translate -A INPUT -p sctp --chunk-types all INIT,DATA:iUbE,SACK,ABORT:T -j ACCEPT
082114
+nft add rule ip filter INPUT sctp chunk data flags & 0xf == 0x5 sctp chunk init exists sctp chunk sack exists sctp chunk abort flags & 0x1 == 0x1 counter accept
082114
+
082114
+iptables-translate -A INPUT -p sctp --chunk-types only SHUTDOWN_COMPLETE -j ACCEPT
082114
+nft add rule ip filter INPUT sctp chunk data missing sctp chunk init missing sctp chunk init-ack missing sctp chunk sack missing sctp chunk heartbeat missing sctp chunk heartbeat-ack missing sctp chunk abort missing sctp chunk shutdown missing sctp chunk shutdown-ack missing sctp chunk error missing sctp chunk cookie-echo missing sctp chunk cookie-ack missing sctp chunk ecne missing sctp chunk cwr missing sctp chunk shutdown-complete exists sctp chunk asconf missing sctp chunk asconf-ack missing sctp chunk forward-tsn missing counter accept
082114
-- 
082114
2.31.1
082114