1 files changed, 8 insertions, 7 deletions

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 605ed2cd7972..da97695e7096 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -259,20 +259,22 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
         const struct inet_diag_handler *handler;
 
         handler = inet_diag_lock_handler(nlh->nlmsg_type);
-        if (!handler)
-                return -ENOENT;
+        if (IS_ERR(handler)) {
+                err = PTR_ERR(handler);
+                goto unlock;
+        }
 
         hashinfo = handler->idiag_hashinfo;
         err = -EINVAL;
 
         if (req->idiag_family == AF_INET) {
-                sk = inet_lookup(hashinfo, req->id.idiag_dst[0],
+                sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
                                  req->id.idiag_dport, req->id.idiag_src[0],
                                  req->id.idiag_sport, req->id.idiag_if);
         }
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
         else if (req->idiag_family == AF_INET6) {
-                sk = inet6_lookup(hashinfo,
+                sk = inet6_lookup(&init_net, hashinfo,
                                   (struct in6_addr *)req->id.idiag_dst,
                                   req->id.idiag_dport,
                                   (struct in6_addr *)req->id.idiag_src,
@@ -708,8 +710,8 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
         struct inet_hashinfo *hashinfo;
 
         handler = inet_diag_lock_handler(cb->nlh->nlmsg_type);
-        if (!handler)
-                goto no_handler;
+        if (IS_ERR(handler))
+                goto unlock;
 
         hashinfo = handler->idiag_hashinfo;
 
@@ -838,7 +840,6 @@ done:
         cb->args[2] = num;
 unlock:
         inet_diag_unlock_handler(handler);
-no_handler:
         return skb->len;
 }