xfrm: Handle blackhole route creation via afinfo.

That way we don't have to potentially do this in every xfrm_lookup()
caller.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 12 insertions, 24 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ac16f3b2a029..35a4ad90a0f5 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1025,18 +1025,12 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 return ERR_PTR(err);
         if (final_dst)
                 ipv6_addr_copy(&fl->fl6_dst, final_dst);
-        if (can_sleep) {
+        if (can_sleep)
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
-                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err == -EREMOTE)
-                        return ip6_dst_blackhole(sock_net(sk), dst);
-                if (err)
-                        return ERR_PTR(err);
-        } else {
-                err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err)
-                        return ERR_PTR(err);
-        }
+
+        err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
+        if (err)
+                return ERR_PTR(err);
         return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
@@ -1070,18 +1064,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 return ERR_PTR(err);
         if (final_dst)
                 ipv6_addr_copy(&fl->fl6_dst, final_dst);
-        if (can_sleep) {
+        if (can_sleep)
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
-                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err == -EREMOTE)
-                        return ip6_dst_blackhole(sock_net(sk), dst);
-                if (err)
-                        return ERR_PTR(err);
-        } else {
-                err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err)
-                        return ERR_PTR(err);
-        }
+
+        err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
+        if (err)
+                return ERR_PTR(err);
         return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index cf6fdeabb6f2..053a92ebf2d5 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -870,7 +870,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 
 EXPORT_SYMBOL(ip6_route_output);
 
-struct dst_entry *ip6_dst_blackhole(struct net *net, struct dst_entry *dst_orig)
+struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_orig)
 {
         struct rt6_info *rt = dst_alloc(&ip6_dst_blackhole_ops, 1);
         struct rt6_info *ort = (struct rt6_info *) dst_orig;
@@ -907,7 +907,6 @@ struct dst_entry *ip6_dst_blackhole(struct net *net, struct dst_entry *dst_orig)
         dst_release(dst_orig);
         return new ? new : ERR_PTR(-ENOMEM);
 }
-EXPORT_SYMBOL_GPL(ip6_dst_blackhole);
 
 /*
  *      Destination cache support functions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index c128ca1affe3..48ce496802fd 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -274,6 +274,7 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
         .get_tos =              xfrm6_get_tos,
         .init_path =            xfrm6_init_path,
         .fill_dst =             xfrm6_fill_dst,
+        .blackhole_route =      ip6_blackhole_route,
 };
 
 static int __init xfrm6_policy_init(void)