Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[pandora-kernel.git] / net / ipv4 / netfilter.c

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index 994a1f2..4614bab 100644 (file)
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -16,7 +16,7 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
        struct net *net = dev_net(skb_dst(skb)->dev);
        const struct iphdr *iph = ip_hdr(skb);
        struct rtable *rt;
-       struct flowi fl = {};
+       struct flowi4 fl4 = {};
        unsigned long orefdst;
        unsigned int hh_len;
        unsigned int type;
@@ -31,14 +31,15 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
         * packets with foreign saddr to appear on the NF_INET_LOCAL_OUT hook.
         */
        if (addr_type == RTN_LOCAL) {
-               fl.fl4_dst = iph->daddr;
+               fl4.daddr = iph->daddr;
                if (type == RTN_LOCAL)
-                       fl.fl4_src = iph->saddr;
-               fl.fl4_tos = RT_TOS(iph->tos);
-               fl.oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
-               fl.mark = skb->mark;
-               fl.flags = skb->sk ? inet_sk_flowi_flags(skb->sk) : 0;
-               if (ip_route_output_key(net, &rt, &fl) != 0)
+                       fl4.saddr = iph->saddr;
+               fl4.flowi4_tos = RT_TOS(iph->tos);
+               fl4.flowi4_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
+               fl4.flowi4_mark = skb->mark;
+               fl4.flowi4_flags = skb->sk ? inet_sk_flowi_flags(skb->sk) : 0;
+               rt = ip_route_output_key(net, &fl4);
+               if (IS_ERR(rt))
                        return -1;
 
                /* Drop old route. */
@@ -47,8 +48,9 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
        } else {
                /* non-local src, find valid iif to satisfy
                 * rp-filter when calling ip_route_input. */
-               fl.fl4_dst = iph->saddr;
-               if (ip_route_output_key(net, &rt, &fl) != 0)
+               fl4.daddr = iph->saddr;
+               rt = ip_route_output_key(net, &fl4);
+               if (IS_ERR(rt))
                        return -1;
 
                orefdst = skb->_skb_refdst;
@@ -66,10 +68,11 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 
 #ifdef CONFIG_XFRM
        if (!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) &&
-           xfrm_decode_session(skb, &fl, AF_INET) == 0) {
+           xfrm_decode_session(skb, flowi4_to_flowi(&fl4), AF_INET) == 0) {
                struct dst_entry *dst = skb_dst(skb);
                skb_dst_set(skb, NULL);
-               if (xfrm_lookup(net, &dst, &fl, skb->sk, 0))
+               dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), skb->sk, 0);
+               if (IS_ERR(dst))
                        return -1;
                skb_dst_set(skb, dst);
        }
@@ -102,7 +105,8 @@ int ip_xfrm_me_harder(struct sk_buff *skb)
                dst = ((struct xfrm_dst *)dst)->route;
        dst_hold(dst);
 
-       if (xfrm_lookup(dev_net(dst->dev), &dst, &fl, skb->sk, 0) < 0)
+       dst = xfrm_lookup(dev_net(dst->dev), dst, &fl, skb->sk, 0);
+       if (IS_ERR(dst))
                return -1;
 
        skb_dst_drop(skb);
@@ -217,9 +221,14 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
        return csum;
 }
 
-static int nf_ip_route(struct dst_entry **dst, struct flowi *fl)
+static int nf_ip_route(struct net *net, struct dst_entry **dst,
+                      struct flowi *fl, bool strict __always_unused)
 {
-       return ip_route_output_key(&init_net, (struct rtable **)dst, fl);
+       struct rtable *rt = ip_route_output_key(net, &fl->u.ip4);
+       if (IS_ERR(rt))
+               return PTR_ERR(rt);
+       *dst = &rt->dst;
+       return 0;
 }
 
 static const struct nf_afinfo nf_ip_afinfo = {