From: Jozsef Kadlecsik Date: Sun, 29 Mar 2015 12:58:51 +0000 (+0200) Subject: Fix broken commit "Check extensions attributes before getting extensions." X-Git-Tag: pablo~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=987e167158651ab2a1089c7be93f5431187d18d0;p=ipset Fix broken commit "Check extensions attributes before getting extensions." Signed-off-by: Jozsef Kadlecsik --- diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index 3c265e5..e20bfa5 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -390,14 +390,6 @@ ip_set_elem_len(struct ip_set *set, struct nlattr *tb[], size_t len) return offset; } - if (unlikely(!ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || - !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) || - !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES) || - !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBMARK) || - !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBPRIO) || - !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBQUEUE))) - return -IPSET_ERR_PROTOCOL; - EXPORT_SYMBOL_GPL(ip_set_elem_len); int @@ -406,6 +398,14 @@ ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[], { u64 fullmark; + if (unlikely(!ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBMARK) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBPRIO) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_SKBQUEUE))) + return -IPSET_ERR_PROTOCOL; + if (tb[IPSET_ATTR_TIMEOUT]) { if (!SET_WITH_TIMEOUT(set)) return -IPSET_ERR_TIMEOUT;