2 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index abf5028db98..f7baaf63742 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -6,6 +6,7 @@
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
+#define SOCK_DIAG_BY_FAMILY 20
 
 #define INET_DIAG_GETSOCK_MAX 24
 
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index a5f3c40ac3c..eb6bdfa9480 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -850,7 +850,7 @@ unlock:
         return skb->len;
 }
 
-static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         int hdrlen = sizeof(struct inet_diag_req);
 
@@ -877,9 +877,22 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         return inet_diag_get_exact(skb, nlh);
 }
 
+static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+{
+        return -EOPNOTSUPP;
+}
+
 static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
-        return inet_diag_rcv_msg(skb, nlh);
+        switch (nlh->nlmsg_type) {
+        case TCPDIAG_GETSOCK:
+        case DCCPDIAG_GETSOCK:
+                return inet_diag_rcv_msg_compat(skb, nlh);
+        case SOCK_DIAG_BY_FAMILY:
+                return __sock_diag_rcv_msg(skb, nlh);
+        default:
+                return -EINVAL;
+        }
 }
 
 static DEFINE_MUTEX(sock_diag_mutex);