diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 8 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dcb533d..1ee4abd 100644 --- a/configure.ac +++ b/configure.ac @@ -766,6 +766,16 @@ else AC_SUBST(HAVE_SKB_PROTOCOL, undef) fi +AC_MSG_CHECKING([kernel source for NLA_POLICY_EXACT_LEN() in netlink.h]) +if test -f $ksourcedir/include/net/netlink.h && \ + $GREP -q 'define NLA_POLICY_EXACT_LEN' $ksourcedir/include/net/netlink.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_NLA_POLICY_EXACT_LEN, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_NLA_POLICY_EXACT_LEN, undef) +fi + AC_MSG_CHECKING([kernel source for struct net_generic]) if test -f $ksourcedir/include/net/netns/generic.h && \ $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index cc61baf..24acc5f 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -58,6 +58,7 @@ #@HAVE_SKB_IIF@ HAVE_SKB_IIF #@HAVE_LIST_FOR_EACH_ENTRY_RCU_FOUR_ARGS@ HAVE_LIST_FOR_EACH_ENTRY_RCU_FOUR_ARGS #@HAVE_SKB_PROTOCOL@ HAVE_SKB_PROTOCOL +#@HAVE_NLA_POLICY_EXACT_LEN@ HAVE_NLA_POLICY_EXACT_LEN #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -483,6 +484,13 @@ static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type) list_for_each_entry_rcu(pos, head, member) #endif +#ifndef HAVE_NLA_POLICY_EXACT_LEN +#define HAVE_NLA_POLICY_EXACT_LEN(_len) { \ + .type = NLA_UNSPEC, \ + .len = _len \ +} +#endif + /* Compiler attributes */ #ifndef __has_attribute # define __has_attribute(x) __GCC4_has_attribute_##x diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index 9de8289..eb87413 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -286,8 +286,7 @@ flag_nested(const struct nlattr *nla) static const struct nla_policy ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] = { [IPSET_ATTR_IPADDR_IPV4] = { .type = NLA_U32 }, - [IPSET_ATTR_IPADDR_IPV6] = { .type = NLA_BINARY, - .len = sizeof(struct in6_addr) }, + [IPSET_ATTR_IPADDR_IPV6] = NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)), }; int |