From: pablo@netfilter.org
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH 3/7] netfilter: ipset: Fix return code for destroy when sets are in use
Date: Mon, 6 Jun 2011 02:11:36 +0200 [thread overview]
Message-ID: <1307319100-21827-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1307319100-21827-1-git-send-email-pablo@netfilter.org>
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/ipset/ip_set_core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 8041bef..42aa64b 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -767,7 +767,7 @@ ip_set_destroy(struct sock *ctnl, struct sk_buff *skb,
if (!attr[IPSET_ATTR_SETNAME]) {
for (i = 0; i < ip_set_max; i++) {
if (ip_set_list[i] != NULL && ip_set_list[i]->ref) {
- ret = IPSET_ERR_BUSY;
+ ret = -IPSET_ERR_BUSY;
goto out;
}
}
--
1.7.2.5
next prev parent reply other threads:[~2011-06-06 0:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 0:11 [PATCH 0/7] netfilter fixes for 3.0.0-rc1 (try 2) pablo
2011-06-06 0:11 ` [PATCH 1/7] netfilter: add more values to enum ip_conntrack_info pablo
2011-06-06 0:11 ` [PATCH 2/7] ipvs: restore support for iptables SNAT pablo
2011-06-06 0:11 ` pablo [this message]
2011-06-06 0:11 ` [PATCH 4/7] netfilter: ipset: Use the stored first cidr value instead of '1' pablo
2011-06-06 0:11 ` [PATCH 5/7] netfilter: nf_nat: fix crash in nf_nat_csum pablo
2011-06-06 0:11 ` [PATCH 6/7] netfilter: nf_conntrack: fix ct refcount leak in l4proto->error() pablo
2011-06-06 2:10 ` "Oleg A. Arkhangelsky"
2011-06-06 23:17 ` Pablo Neira Ayuso
2011-06-06 0:11 ` [PATCH 7/7] netfilter: use unsigned variables for packet lengths in ip[6]_queue pablo
2011-06-06 0:15 ` [PATCH 0/7] netfilter fixes for 3.0.0-rc1 (try 2) David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307319100-21827-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).