From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 21 Feb 2013 10:12:40 +0000 (+0100)
Subject: "Directory not empty" error message (reported by John Brendler)
X-Git-Tag: v6.17~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fced588fdddd1dc3b67502bdddfe48a69fe6222b;p=ipset

"Directory not empty" error message (reported by John Brendler)

When an entry flagged with "nomatch" was tested by ipset, it
returned the error message "Kernel error received:
Directory not empty" instead of "<element> is NOT in set <setname>".

The internal error code was not properly transformed before returning
to userspace, fixed.
---

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index 962f124..7345280 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -1507,7 +1507,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 */