Subject: [RFC] net: netlink -- Allow netlink_dump to return error code if protocol handler is missed

From: Cyrill Gorcunov <[email-masked]>
Date: Fri, 2 Nov 2012 21:35:50 +0400

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 netlink_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 <[email-masked]>
CC: David Miller <[email-masked]>
CC: Eric Dumazet <[email-masked]>
CC: Pavel Emelyanov <[email-masked]>
---
 net/ipv4/inet_diag.c     |    5 ++++-
 net/netlink/af_netlink.c |    4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: linux-2.6.git/net/ipv4/inet_diag.c
===================================================================
--- linux-2.6.git.orig/net/ipv4/inet_diag.c
+++ linux-2.6.git/net/ipv4/inet_diag.c
@@ -895,13 +895,16 @@ static int __inet_diag_dump(struct sk_bu
 		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)
Index: linux-2.6.git/net/netlink/af_netlink.c
===================================================================
--- linux-2.6.git.orig/net/netlink/af_netlink.c
+++ linux-2.6.git/net/netlink/af_netlink.c
@@ -1740,6 +1740,10 @@ static int netlink_dump(struct sock *sk)
 		else
 			__netlink_sendskb(sk, skb);
 		return 0;
+	} else if (len < 0) {
+		err = len;
+		nlk->cb = NULL;
+		goto errout_skb;
 	}
 
 	nlh = nlmsg_put_answer(skb, cb, NLMSG_DONE, sizeof(len), NLM_F_MULTI);