[PATCH] iptables: state match incompatibilty across versions

[PATCH] iptables: state match incompatibilty across versions

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

As reported in Debian bug #718810 [1], state match rules added in < 1.4.16
iptables versions are incorrectly displayed by >= 1.4.16 iptables versions.
Issue bisected to commit 0d701631 (libxt_state: replace as an alias to
xt_conntrack).

Fix this by adding the missing .print and .save functions for state match
aliases in the conntrack match.

Signed-off-by: Phil Oester <kernel@linuxace.com>

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718810


[-- Attachment #2: patch-state --]
[-- Type: text/plain, Size: 1309 bytes --]

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 9f7b5db..128bbd2 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -1272,6 +1272,8 @@ static struct xtables_match conntrack_mt_reg[] = {
 		.size          = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo1)),
 		.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo1)),
 		.help          = state_help,
+		.print         = state_print,
+		.save          = state_save,
 		.x6_parse      = state_ct1_parse,
 		.x6_options    = state_opts,
 	},
@@ -1285,6 +1287,8 @@ static struct xtables_match conntrack_mt_reg[] = {
 		.size          = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo2)),
 		.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo2)),
 		.help          = state_help,
+		.print         = state_print,
+		.save          = state_save,
 		.x6_parse      = state_ct23_parse,
 		.x6_options    = state_opts,
 	},
@@ -1298,6 +1302,8 @@ static struct xtables_match conntrack_mt_reg[] = {
 		.size          = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo3)),
 		.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo3)),
 		.help          = state_help,
+		.print         = state_print,
+		.save          = state_save,
 		.x6_parse      = state_ct23_parse,
 		.x6_options    = state_opts,
 	},

Re: [PATCH] iptables: state match incompatibilty across versions

[Pablo Neira Ayuso]

On Wed, Aug 07, 2013 at 04:44:49PM -0700, Phil Oester wrote:
> As reported in Debian bug #718810 [1], state match rules added in < 1.4.16
> iptables versions are incorrectly displayed by >= 1.4.16 iptables versions.
> Issue bisected to commit 0d701631 (libxt_state: replace as an alias to
> xt_conntrack).
> 
> Fix this by adding the missing .print and .save functions for state match
> aliases in the conntrack match.

The problem seems to be related with xtables_mt_prefer, which ranks
the conntrack match higher than state match itself, as it treats state
as an alias. This is OK in the userspace to kernel path, where state
is internally transformed to conntrack, but not from kernel to
userspace, where the state match info is being interpreted by the
conntrack match.

We could fix this from libxtables, but adding some parameter to
xtables_find_match to indicate what path this function is called from.
But that requires a new ABI change to resolve it, which will break
Jamal's tc action again, I guess stephen will not be very happy with
it.

I'm going to take your patch, it's simple and it fixes this issue.

Thanks Phil.