summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-01-13 14:19:55 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2011-01-13 17:03:39 +0100
commitf31e8d4982653b39fe312f9938be0f49dd9ab5fa (patch)
tree32ec35631317568dc98cdc178a6950216b3149c9 /net
parent2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa (diff)
downloadlinux-3.10-f31e8d4982653b39fe312f9938be0f49dd9ab5fa.tar.gz
linux-3.10-f31e8d4982653b39fe312f9938be0f49dd9ab5fa.tar.bz2
linux-3.10-f31e8d4982653b39fe312f9938be0f49dd9ab5fa.zip
netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()
This patch fixes a loop in ctnetlink_get_conntrack() that can be triggered if you use the same socket to receive events and to perform a GET operation. Under heavy load, netlink_unicast() may return -EAGAIN, this error code is reserved in nfnetlink for the module load-on-demand. Instead, we return -ENOBUFS which is the appropriate error code that has to be propagated to user-space. Reported-by: Holger Eitzenberger <holger@eitzenberger.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 5cb8d3027b1..2b7eef37875 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -972,7 +972,8 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
free:
kfree_skb(skb2);
out:
- return err;
+ /* this avoids a loop in nfnetlink. */
+ return err == -EAGAIN ? -ENOBUFS : err;
}
#ifdef CONFIG_NF_NAT_NEEDED