* [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
@ 2014-02-13 11:40 Florian Westphal
2014-02-13 11:47 ` Pablo Neira Ayuso
2014-02-14 8:23 ` Jozsef Kadlecsik
0 siblings, 2 replies; 7+ messages in thread
From: Florian Westphal @ 2014-02-13 11:40 UTC (permalink / raw)
To: netfilter-devel; +Cc: 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.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
include/libipset/linux_ip_set.h | 4 ++--
kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h
index c2bae85..a8d436f 100644
--- a/include/libipset/linux_ip_set.h
+++ b/include/libipset/linux_ip_set.h
@@ -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,
diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
index c2bae85..a8d436f 100644
--- a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
@@ -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,
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 11:40 [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage Florian Westphal
@ 2014-02-13 11:47 ` Pablo Neira Ayuso
2014-02-13 11:51 ` Florian Westphal
2014-02-14 8:23 ` Jozsef Kadlecsik
1 sibling, 1 reply; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-02-13 11:47 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Thu, Feb 13, 2014 at 12:40:59PM +0100, Florian Westphal wrote:
> 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
> 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 11:47 ` Pablo Neira Ayuso
@ 2014-02-13 11:51 ` Florian Westphal
2014-02-13 11:55 ` Pablo Neira Ayuso
0 siblings, 1 reply; 7+ messages in thread
From: Florian Westphal @ 2014-02-13 11:51 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Thu, Feb 13, 2014 at 12:40:59PM +0100, Florian Westphal wrote:
> > 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 11:51 ` Florian Westphal
@ 2014-02-13 11:55 ` Pablo Neira Ayuso
2014-02-13 12:13 ` Jozsef Kadlecsik
0 siblings, 1 reply; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-02-13 11:55 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Thu, Feb 13, 2014 at 12:51:26PM +0100, Florian Westphal wrote:
> Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > On Thu, Feb 13, 2014 at 12:40:59PM +0100, Florian Westphal wrote:
> > > 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.
Ah, I see.
> I did not find any references to MARKMASK in nf-next.git.
I think this is still in Jozsef's tree.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 11:55 ` Pablo Neira Ayuso
@ 2014-02-13 12:13 ` Jozsef Kadlecsik
2014-02-13 12:54 ` Pablo Neira Ayuso
0 siblings, 1 reply; 7+ messages in thread
From: Jozsef Kadlecsik @ 2014-02-13 12:13 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
On Thu, 13 Feb 2014, Pablo Neira Ayuso wrote:
> On Thu, Feb 13, 2014 at 12:51:26PM +0100, Florian Westphal wrote:
> > Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > > On Thu, Feb 13, 2014 at 12:40:59PM +0100, Florian Westphal wrote:
> > > > 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.
>
> Ah, I see.
>
> > 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 : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 12:13 ` Jozsef Kadlecsik
@ 2014-02-13 12:54 ` Pablo Neira Ayuso
0 siblings, 0 replies; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-02-13 12:54 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: Florian Westphal, netfilter-devel
On Thu, Feb 13, 2014 at 01:13:39PM +0100, Jozsef Kadlecsik wrote:
> On Thu, 13 Feb 2014, Pablo Neira Ayuso wrote:
>
> > On Thu, Feb 13, 2014 at 12:51:26PM +0100, Florian Westphal wrote:
> > > Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > > > On Thu, Feb 13, 2014 at 12:40:59PM +0100, Florian Westphal wrote:
> > > > > 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.
> >
> > Ah, I see.
> >
> > > 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!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage
2014-02-13 11:40 [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage Florian Westphal
2014-02-13 11:47 ` Pablo Neira Ayuso
@ 2014-02-14 8:23 ` Jozsef Kadlecsik
1 sibling, 0 replies; 7+ messages in thread
From: Jozsef Kadlecsik @ 2014-02-14 8:23 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Thu, 13 Feb 2014, Florian Westphal wrote:
> 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 : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-02-14 8:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-13 11:40 [PATCH ipset] kernel: uapi: fix MARKMASK attr ABI breakage Florian Westphal
2014-02-13 11:47 ` Pablo Neira Ayuso
2014-02-13 11:51 ` Florian Westphal
2014-02-13 11:55 ` Pablo Neira Ayuso
2014-02-13 12:13 ` Jozsef Kadlecsik
2014-02-13 12:54 ` Pablo Neira Ayuso
2014-02-14 8:23 ` Jozsef Kadlecsik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.