aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@openvz.org>2012-11-03 09:30:34 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-04 01:56:49 -0400
commitcacb6ba0f36ab14a507f4ee7697e8332899015d2 (patch)
tree824b41fdf7241048a9a5529d87cda49245e40d6d /net
parentefc7ce0334b68387b48baf16a285a9b1d5c19256 (diff)
downloadvexpress-lsk-cacb6ba0f36ab14a507f4ee7697e8332899015d2.tar.gz
net: inet_diag -- Return error code if protocol handler is missed
We've observed that in case if UDP diag module is not supported in kernel the netlink returns NLMSG_DONE without notifying a caller that handler is missed. This patch makes __inet_diag_dump to return error code instead. So as example it become possible to detect such situation and handle it gracefully on userspace level. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> CC: David Miller <davem@davemloft.net> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Pavel Emelyanov <xemul@parallels.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/inet_diag.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 535584c00f9..0c34bfabc11 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -892,13 +892,16 @@ static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
struct inet_diag_req_v2 *r, struct nlattr *bc)
{
const struct inet_diag_handler *handler;
+ int err = 0;
handler = inet_diag_lock_handler(r->sdiag_protocol);
if (!IS_ERR(handler))
handler->dump(skb, cb, r, bc);
+ else
+ err = PTR_ERR(handler);
inet_diag_unlock_handler(handler);
- return skb->len;
+ return err ? : skb->len;
}
static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)