Skip to contentSkip to conversation

kernel: uapi: fix MARKMASK attr ABI breakage

PATCH In review Florian Westphal 3 participants 7 messages Feb 13, 2014 – Feb 14, 2014 netfilter

lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 kernel: uapi: fix MARKMASK attr ABI breakage

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type) inserted IPSET_ATTR_MARKMASK in-between other enum values, i.e. changing values of all further attributes. This causes 'ipset list' segfault on existing kernels since ipset no longer finds IPSET_ATTR_MEMSIZE (it has a different value on kernel side).

Jozsef points out it should be moved below IPSET_ATTR_MARK which works since there is some extra reserved space after that value.

---
 include/libipset/linux_ip_set.h                    | 4 ++--
 kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/libipset/linux_ip_set.h +2 -2
index c2bae85..a8d436f 100644
@@ -84,13 +84,13 @@ enum {
 	IPSET_ATTR_CADT_FLAGS,	/* 8 */
 	IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO,	/* 9 */
 	IPSET_ATTR_MARK,	/* 10 */
+	IPSET_ATTR_MARKMASK,	/* 11 */
 	/* Reserve empty slots */
 	IPSET_ATTR_CADT_MAX = 16,
 	/* Create-only specific attributes */
 	IPSET_ATTR_GC,
 	IPSET_ATTR_HASHSIZE,
 	IPSET_ATTR_MAXELEM,
-	IPSET_ATTR_MARKMASK,
 	IPSET_ATTR_NETMASK,
 	IPSET_ATTR_PROBES,
 	IPSET_ATTR_RESIZE,
@@ -140,7 +140,6 @@ enum ipset_errno {
 	IPSET_ERR_EXIST,
 	IPSET_ERR_INVALID_CIDR,
 	IPSET_ERR_INVALID_NETMASK,
-	IPSET_ERR_INVALID_MARKMASK,
 	IPSET_ERR_INVALID_FAMILY,
 	IPSET_ERR_TIMEOUT,
 	IPSET_ERR_REFERENCED,
@@ -148,6 +147,7 @@ enum ipset_errno {
 	IPSET_ERR_IPADDR_IPV6,
 	IPSET_ERR_COUNTER,
 	IPSET_ERR_COMMENT,
+	IPSET_ERR_INVALID_MARKMASK,
 
 	/* Type specific error codes */
 	IPSET_ERR_TYPE_SPECIFIC = 4352,
kernel/include/uapi/linux/netfilter/ipset/ip_set.h +2 -2
index c2bae85..a8d436f 100644
@@ -84,13 +84,13 @@ enum {
 	IPSET_ATTR_CADT_FLAGS,	/* 8 */
 	IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO,	/* 9 */
 	IPSET_ATTR_MARK,	/* 10 */
+	IPSET_ATTR_MARKMASK,	/* 11 */
 	/* Reserve empty slots */
 	IPSET_ATTR_CADT_MAX = 16,
 	/* Create-only specific attributes */
 	IPSET_ATTR_GC,
 	IPSET_ATTR_HASHSIZE,
 	IPSET_ATTR_MAXELEM,
-	IPSET_ATTR_MARKMASK,
 	IPSET_ATTR_NETMASK,
 	IPSET_ATTR_PROBES,
 	IPSET_ATTR_RESIZE,
@@ -140,7 +140,6 @@ enum ipset_errno {
 	IPSET_ERR_EXIST,
 	IPSET_ERR_INVALID_CIDR,
 	IPSET_ERR_INVALID_NETMASK,
-	IPSET_ERR_INVALID_MARKMASK,
 	IPSET_ERR_INVALID_FAMILY,
 	IPSET_ERR_TIMEOUT,
 	IPSET_ERR_REFERENCED,
@@ -148,6 +147,7 @@ enum ipset_errno {
 	IPSET_ERR_IPADDR_IPV6,
 	IPSET_ERR_COUNTER,
 	IPSET_ERR_COMMENT,
+	IPSET_ERR_INVALID_MARKMASK,
 
 	/* Type specific error codes */
 	IPSET_ERR_TYPE_SPECIFIC = 4352,
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 1 line · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type)

I don't find that commit in the tree:

$ git show 2dfb973c0dcc6d2211
fatal: ambiguous argument '2dfb973c0dcc6d2211': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions
Quoted 7 lines

inserted IPSET_ATTR_MARKMASK in-between other enum values, i.e. changing values of all further attributes. This causes 'ipset list' segfault on existing kernels since ipset no longer finds IPSET_ATTR_MEMSIZE (it has a different value on kernel side).

Jozsef points out it should be moved below IPSET_ATTR_MARK which works since there is some extra reserved space after that value.

author maintainer
#2 lore raw
Quoted 9 lines · Pablo Neira Ayuso
Quoted 1 line · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type)

I don't find that commit in the tree:

$ git show 2dfb973c0dcc6d2211
fatal: ambiguous argument '2dfb973c0dcc6d2211': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions

its in ipset.git, not in kernel. Sorry if that was not clear.

I did not find any references to MARKMASK in nf-next.git.

#3 lore raw
Quoted 4 lines · Florian Westphal
Quoted 3 lines · Pablo Neira Ayuso
Quoted 1 line · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type)

Quoted 8 lines
Quoted 6 lines

I don't find that commit in the tree:

$ git show 2dfb973c0dcc6d2211
fatal: ambiguous argument '2dfb973c0dcc6d2211': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions

its in ipset.git, not in kernel. Sorry if that was not clear.

Ah, I see.

Quoted 1 line

I did not find any references to MARKMASK in nf-next.git.

I think this is still in Jozsef's tree.

#4 lore raw
Quoted 12 lines · Pablo Neira Ayuso
Quoted 11 lines · Florian Westphal
Quoted 9 lines · Pablo Neira Ayuso
Quoted 1 line · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type)

I don't find that commit in the tree:

$ git show 2dfb973c0dcc6d2211
fatal: ambiguous argument '2dfb973c0dcc6d2211': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions
Quoted 7 lines
Quoted 1 line

its in ipset.git, not in kernel. Sorry if that was not clear.

Ah, I see.

Quoted 1 line

I did not find any references to MARKMASK in nf-next.git.

I think this is still in Jozsef's tree.

Yes, it's there - I'll submit the patches after Josh's forceadd patch is incorporated.

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary
#5 lore raw
Quoted 16 lines · Jozsef Kadlecsik
Quoted 14 lines · Pablo Neira Ayuso
Quoted 12 lines · Florian Westphal
Quoted 9 lines · Pablo Neira Ayuso
Quoted 1 line · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type)

I don't find that commit in the tree:

$ git show 2dfb973c0dcc6d2211
fatal: ambiguous argument '2dfb973c0dcc6d2211': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions

its in ipset.git, not in kernel. Sorry if that was not clear.

Quoted 8 lines
Quoted 5 lines

Ah, I see.

Quoted 1 line

I did not find any references to MARKMASK in nf-next.git.

I think this is still in Jozsef's tree.

Yes, it's there - I'll submit the patches after Josh's forceadd patch is incorporated.

No problem, I understand you needed some time to get it in good shape. thanks Jozsef!

#6 lore raw
In reply to Florian Westphal
Quoted 8 lines · Florian Westphal

commit 2dfb973c0dcc6d2211 (add markmask for hash:ip,mark data type) inserted IPSET_ATTR_MARKMASK in-between other enum values, i.e. changing values of all further attributes. This causes 'ipset list' segfault on existing kernels since ipset no longer finds IPSET_ATTR_MEMSIZE (it has a different value on kernel side).

Jozsef points out it should be moved below IPSET_ATTR_MARK which works since there is some extra reserved space after that value.

Patch is applied, thanks Florian!

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary