]> granicus.if.org Git - ipset/commit
kernel: uapi: fix MARKMASK attr ABI breakage
authorFlorian Westphal <fw@strlen.de>
Thu, 13 Feb 2014 11:40:59 +0000 (12:40 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 14 Feb 2014 08:22:09 +0000 (09:22 +0100)
commitf3dc2bd75a9e8f4c0e3ff77ffb517d51d70723f6
tree13c85ee5412f00b73b4156b9885e7613d055c481
parente8466647b10cf40f03af2c1d8afa44a13b1f74a3
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.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
include/libipset/linux_ip_set.h
kernel/include/uapi/linux/netfilter/ipset/ip_set.h