3 files changed, 9 insertions, 12 deletions

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8f78aace0a9d..5d125c1293a9 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -520,9 +520,8 @@ extern struct dst_entry *	ip6_sk_dst_lookup_flow(struct sock *sk,
                                                        struct flowi *fl,
                                                        const struct in6_addr *final_dst,
                                                        bool can_sleep);
-extern int                      ip6_dst_blackhole(struct sock *sk,
-                                                  struct dst_entry **dst,
-                                                  struct flowi *fl);
+extern struct dst_entry *       ip6_dst_blackhole(struct net *net,
+                                                  struct dst_entry *orig_dst);
 
 /*
  *      skb processing functions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index faf7b9d1d536..ac16f3b2a029 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1029,7 +1029,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
                 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
                 if (err == -EREMOTE)
-                        err = ip6_dst_blackhole(sk, &dst, fl);
+                        return ip6_dst_blackhole(sock_net(sk), dst);
                 if (err)
                         return ERR_PTR(err);
         } else {
@@ -1074,7 +1074,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
                 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
                 if (err == -EREMOTE)
-                        err = ip6_dst_blackhole(sk, &dst, fl);
+                        return ip6_dst_blackhole(sock_net(sk), dst);
                 if (err)
                         return ERR_PTR(err);
         } else {
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7e9443f835f9..cf6fdeabb6f2 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -870,11 +870,10 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 
 EXPORT_SYMBOL(ip6_route_output);
 
-int ip6_dst_blackhole(struct sock *sk, struct dst_entry **dstp, struct flowi *fl)
+struct dst_entry *ip6_dst_blackhole(struct net *net, struct dst_entry *dst_orig)
 {
-        struct rt6_info *ort = (struct rt6_info *) *dstp;
-        struct rt6_info *rt = (struct rt6_info *)
-                dst_alloc(&ip6_dst_blackhole_ops, 1);
+        struct rt6_info *rt = dst_alloc(&ip6_dst_blackhole_ops, 1);
+        struct rt6_info *ort = (struct rt6_info *) dst_orig;
         struct dst_entry *new = NULL;
 
         if (rt) {
@@ -905,9 +904,8 @@ int ip6_dst_blackhole(struct sock *sk, struct dst_entry **dstp, struct flowi *fl
                 dst_free(new);
         }
 
-        dst_release(*dstp);
-        *dstp = new;
-        return new ? 0 : -ENOMEM;
+        dst_release(dst_orig);
+        return new ? new : ERR_PTR(-ENOMEM);
 }
 EXPORT_SYMBOL_GPL(ip6_dst_blackhole);