Xtables-addons 2.14

DNETMAP: remove NF_CT_ASSERT use
The hooks are already checked by the xtables core (due to struct xt_target::hooks).
2025-09-20 19:44:56 +02:00 · 2017-11-22 18:29:25 +01:00 · 2017-11-22 18:27:36 +01:00 · 2017-11-22 18:24:10 +01:00 · 2017-07-23 19:59:36 +02:00 · 2017-07-23 19:56:42 +02:00
7 changed files with 16 additions and 11 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [2.13])
+AC_INIT([xtables-addons], [2.14])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,14 @@ HEAD
 ====


+v2.14 (2017-11-22)
+==================
+Enhancements:
+- support for Linux up to 4.14
+Fixes:
+- xt_DNETMAP: fix some reports from PVSStudio (a static checker)
+
+
 v2.13 (2017-06-29)
 ==================
 Enhancements:
--- a/extensions/pknock/xt_pknock.c
+++ b/extensions/pknock/xt_pknock.c
@@ -619,9 +619,10 @@ static void add_peer(struct peer *peer, struct xt_pknock_rule *rule)
 */
 static void remove_peer(struct peer *peer)
 {
+	if (peer == NULL)
+		return;
 	list_del(&peer->head);
-	if (peer != NULL)
-		kfree(peer);
+	kfree(peer);
 }

 /**
--- a/extensions/xt_DELUDE.c
+++ b/extensions/xt_DELUDE.c
@@ -79,7 +79,7 @@ static void delude_send_reset(struct net *net, struct sk_buff *oldskb,
 	tcph->doff   = sizeof(struct tcphdr) / 4;

 	/* DELUDE essential part */
-	if (oth->syn && !oth->ack && !oth->rst && !oth->fin) {
+	if (oth->syn && !oth->ack && !oth->fin) {
 		tcph->syn     = true;
 		tcph->seq     = 0;
 		tcph->ack     = true;
--- a/extensions/xt_DNETMAP.c
+++ b/extensions/xt_DNETMAP.c
@@ -376,10 +376,6 @@ dnetmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
 #else
 	unsigned int hooknum = par->hooknum;
 #endif
-
-	NF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING ||
-		     hooknum == NF_INET_LOCAL_OUT ||
-		     hooknum == NF_INET_PRE_ROUTING);
 	ct = nf_ct_get(skb, &ctinfo);

 	jttl = tginfo->flags & XT_DNETMAP_TTL ? tginfo->ttl * HZ : jtimeout;
@@ -398,7 +394,7 @@ dnetmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
 		/* if prefix is specified, we check if
 		it matches lookedup entry */
 		if (tginfo->flags & XT_DNETMAP_PREFIX)
-			if (memcmp(mr, &e->prefix, sizeof(*mr)))
+			if (memcmp(mr, &e->prefix->prefix, sizeof(*mr)))
 				goto no_rev_map;
 		/* don't reset ttl if flag is set */
 		if (jttl >= 0 && (! (e->flags & XT_DNETMAP_STATIC) ) ) {
--- a/extensions/xt_ipp2p.c
+++ b/extensions/xt_ipp2p.c
@@ -511,7 +511,7 @@ search_bittorrent(const unsigned char *payload, const unsigned int plen)
 		 * but *must have* one (or more) of strings listed below (true for scrape and announce)
 		 */
 		if (memcmp(payload, "GET /", 5) == 0) {
-			if (HX_memmem(payload, plen, "info_hash=", 9) != NULL)
+			if (HX_memmem(payload, plen, "info_hash=", 10) != NULL)
 				return IPP2P_BIT * 100 + 1;
 			if (HX_memmem(payload, plen, "peer_id=", 8) != NULL)
 				return IPP2P_BIT * 100 + 2;
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "" "" "v2.13 (2017-06-27)"
+.TH xtables-addons 8 "" "" "v2.14 (2017-11-22)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets
Author	SHA1	Message	Date
Jan Engelhardt	0e9037b000	Xtables-addons 2.14	2017-11-22 18:29:25 +01:00
Jan Engelhardt	0a6091b64a	DNETMAP: remove NF_CT_ASSERT use The hooks are already checked by the xtables core (due to struct xt_target::hooks).	2017-11-22 18:27:36 +01:00
Jan Engelhardt	b565a85fb6	DNETMAP: fix write past end of buffer	2017-11-22 18:24:10 +01:00
Jan Engelhardt	89c80f5981	DELUDE: fix PVSStudio reports V560 A part of conditional expression is always true: !oth->rst.	2017-07-23 19:59:36 +02:00
Jan Engelhardt	8579fd2b3b	ipp2p: fix PVSStudio reports V666 Consider inspecting fourth argument of the function 'HX_memmem'. It is possible that the value does not correspond with the length of a string which was passed with the third argument.	2017-07-23 19:56:42 +02:00
Jan Engelhardt	0a836e9677	pknock: fix PVSStudio static analyzer reports V595 The 'peer' pointer was utilized before it was verified against nullptr.	2017-07-23 19:55:06 +02:00