diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-26 23:24:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-26 23:24:26 +0100 |
| commit | b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d (patch) | |
| tree | 611d2648429eff830a6c4047e12e108fef3173f4 /net | |
| parent | Merge branch 'sfc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (diff) | |
| parent | netfilter: ipset: "Directory not empty" error message (diff) | |
| download | linux-b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d.tar.xz linux-b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains two bugfixes for netfilter/ipset via
Jozsef Kadlecsik, they are:
* Fix timeout corruption if sets are resized, by Josh Hunt.
* Fix bogus error report if the flag nomatch is set, from Jozsef.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index f82b2e606cfd..1ba9dbc0e107 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1470,7 +1470,8 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb, if (ret == -EAGAIN) ret = 1; - return ret < 0 ? ret : ret > 0 ? 0 : -IPSET_ERR_EXIST; + return (ret < 0 && ret != -ENOTEMPTY) ? ret : + ret > 0 ? 0 : -IPSET_ERR_EXIST; } /* Get headed data of a set */ |