netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / xfrm6_policy.c

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 181cf91538f1c16ae4db7cccaa1e77b5cd85848d..08e4cbbe3f04e5f64e6d91f8b7864c8108d5e0ef 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -38,7 +38,7 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
        if (saddr)
                memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src));
 
-       dst = ip6_route_output(NULL, &fl);
+       dst = ip6_route_output(&init_net, NULL, &fl);
 
        err = dst->error;
        if (dst->error) {
@@ -52,13 +52,16 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
 static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
 {
        struct dst_entry *dst;
+       struct net_device *dev;
 
        dst = xfrm6_dst_lookup(0, NULL, daddr);
        if (IS_ERR(dst))
                return -EHOSTUNREACH;
 
-       ipv6_get_saddr(dst, (struct in6_addr *)&daddr->a6,
-                      (struct in6_addr *)&saddr->a6);
+       dev = ip6_dst_idev(dst)->dev;
+       ipv6_dev_get_saddr(dev_net(dev), dev,
+                          (struct in6_addr *)&daddr->a6, 0,
+                          (struct in6_addr *)&saddr->a6);
        dst_release(dst);
        return 0;
 }
@@ -98,6 +101,20 @@ static int xfrm6_get_tos(struct flowi *fl)
        return 0;
 }
 
+static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
+                          int nfheader_len)
+{
+       if (dst->ops->family == AF_INET6) {
+               struct rt6_info *rt = (struct rt6_info*)dst;
+               if (rt->rt6i_node)
+                       path->path_cookie = rt->rt6i_node->fn_sernum;
+       }
+
+       path->u.rt6.rt6i_nfheader_len = nfheader_len;
+
+       return 0;
+}
+
 static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
 {
        struct rt6_info *rt = (struct rt6_info*)xdst->route;
@@ -115,6 +132,8 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
                                                   RTF_LOCAL);
        xdst->u.rt6.rt6i_metric = rt->rt6i_metric;
        xdst->u.rt6.rt6i_node = rt->rt6i_node;
+       if (rt->rt6i_node)
+               xdst->route_cookie = rt->rt6i_node->fn_sernum;
        xdst->u.rt6.rt6i_gateway = rt->rt6i_gateway;
        xdst->u.rt6.rt6i_dst = rt->rt6i_dst;
        xdst->u.rt6.rt6i_src = rt->rt6i_src;
@@ -123,7 +142,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
 }
 
 static inline void
-_decode_session6(struct sk_buff *skb, struct flowi *fl)
+_decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
 {
        u16 offset = skb_network_header_len(skb);
        struct ipv6hdr *hdr = ipv6_hdr(skb);
@@ -132,8 +151,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
        u8 nexthdr = nh[IP6CB(skb)->nhoff];
 
        memset(fl, 0, sizeof(struct flowi));
-       ipv6_addr_copy(&fl->fl6_dst, &hdr->daddr);
-       ipv6_addr_copy(&fl->fl6_src, &hdr->saddr);
+       ipv6_addr_copy(&fl->fl6_dst, reverse ? &hdr->saddr : &hdr->daddr);
+       ipv6_addr_copy(&fl->fl6_src, reverse ? &hdr->daddr : &hdr->saddr);
 
        while (pskb_may_pull(skb, nh + offset + 1 - skb->data)) {
                nh = skb_network_header(skb);
@@ -156,8 +175,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, nh + offset + 4 - skb->data)) {
                                __be16 *ports = (__be16 *)exthdr;
 
-                               fl->fl_ip_sport = ports[0];
-                               fl->fl_ip_dport = ports[1];
+                               fl->fl_ip_sport = ports[!!reverse];
+                               fl->fl_ip_dport = ports[!reverse];
                        }
                        fl->proto = nexthdr;
                        return;
@@ -196,7 +215,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
        }
 }
 
-static inline int xfrm6_garbage_collect(void)
+static inline int xfrm6_garbage_collect(struct dst_ops *ops)
 {
        xfrm6_policy_afinfo.garbage_collect();
        return (atomic_read(&xfrm6_dst_ops.entries) > xfrm6_dst_ops.gc_thresh*2);
@@ -230,7 +249,7 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
        xdst = (struct xfrm_dst *)dst;
        if (xdst->u.rt6.rt6i_idev->dev == dev) {
                struct inet6_dev *loopback_idev =
-                       in6_dev_get(dev->nd_net->loopback_dev);
+                       in6_dev_get(dev_net(dev)->loopback_dev);
                BUG_ON(!loopback_idev);
 
                do {
@@ -256,6 +275,7 @@ static struct dst_ops xfrm6_dst_ops = {
        .local_out =            __ip6_local_out,
        .gc_thresh =            1024,
        .entry_size =           sizeof(struct xfrm_dst),
+       .entries =              ATOMIC_INIT(0),
 };
 
 static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
@@ -266,6 +286,7 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
        .find_bundle =          __xfrm6_find_bundle,
        .decode_session =       _decode_session6,
        .get_tos =              xfrm6_get_tos,
+       .init_path =            xfrm6_init_path,
        .fill_dst =             xfrm6_fill_dst,
 };