This is a note to let you know that I've just added the patch titled
netfilter: ipset: fix ip_set_flush return code
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-ipset-fix-ip_set_flush-return-code.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 0266ba0fb9d39bacdc9ef53f817b5c1f0bb24fdd Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <[email protected]>
Date: Tue, 24 May 2011 10:20:19 +0200
Subject: netfilter: ipset: fix ip_set_flush return code
From: Jozsef Kadlecsik <[email protected]>
[ Upstream commit 9184a9cba622d9e38462ce11dff7da094b4fea84 ]
ip_set_flush returned -EPROTO instead of -IPSET_ERR_PROTOCOL, fixed
Signed-off-by: Jozsef Kadlecsik <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/netfilter/ipset/ip_set_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -815,7 +815,7 @@ ip_set_flush(struct sock *ctnl, struct s
ip_set_id_t i;
if (unlikely(protocol_failed(attr)))
- return -EPROTO;
+ return -IPSET_ERR_PROTOCOL;
if (!attr[IPSET_ATTR_SETNAME]) {
for (i = 0; i < ip_set_max; i++)
Patches currently in stable-queue which might be from [email protected]
are
queue-2.6.39/netfilter-ipset-use-proper-timeout-value-to-jiffies-conversion.patch
queue-2.6.39/netfilter-ipset-remove-unused-variable-from-type_pf_tdel.patch
queue-2.6.39/netfilter-ipset-fix-ip_set_flush-return-code.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
