From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 9 Nov 2005 21:03:26 +0000 (-0800)
Subject: [NETFILTER] ctnetlink: propagate error instaed of returning -EPERM
X-Git-Tag: v2.6.15-rc1~60^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcda46128d5cb50075339b79ce585ab767337e9e;p=linux-2.6

[NETFILTER] ctnetlink: propagate error instaed of returning -EPERM

Propagate the error to userspace instead of returning -EPERM if the get
conntrack operation fails.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index cfc5487e62..7fe7456596 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -802,7 +802,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
 free:
 	kfree_skb(skb2);
 out:
-	return -1;
+	return err;
 }
 
 static inline int