xfrm: no need to set DST_NOPOLICY in IPv4

This is a cleanup patch following commit e6175a2ed1f1
("xfrm: fix "disable_policy" flag use when arriving from different devices")
which made DST_NOPOLICY no longer be used for inbound policy checks.

On outbound the flag was set, but never used.

As such, avoid setting it altogether and remove the nopolicy argument
from rt_dst_alloc().

Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Reviewed-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 40445a12c6820c41fc9133b5c980d0ecac0d9ada..5df7a0abc39d5f123bdb51891455551fc623b6c4 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -1077,7 +1077,7 @@ static int vrf_rtable_create(struct net_device *dev)
                return -ENOMEM;
 
        /* create a dst for routing packets out through a VRF device */
-       rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1, 1);
+       rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1);
        if (!rth)
                return -ENOMEM;
 

diff --git a/include/net/route.h b/include/net/route.h
index 991a3985712dcb555ff3bd08f15e7f5dad4d1469..b6743ff88e30b9dba0e23bf3a852783128463fe2 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -244,8 +244,7 @@ void ip_rt_multicast_event(struct in_device *);
 int ip_rt_ioctl(struct net *, unsigned int cmd, struct rtentry *rt);
 void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);
 struct rtable *rt_dst_alloc(struct net_device *dev,
-                            unsigned int flags, u16 type,
-                            bool nopolicy, bool noxfrm);
+                           unsigned int flags, u16 type, bool noxfrm);
 struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt);
 
 struct in_ifaddr;

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 2d16bcc7d3461af1690084fee1ddb335cb7040c3..bd351fab46e60acb6b4272746608a48111cfacf5 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1626,12 +1626,11 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,
 
 struct rtable *rt_dst_alloc(struct net_device *dev,
                            unsigned int flags, u16 type,
-                           bool nopolicy, bool noxfrm)
+                           bool noxfrm)
 {
        struct rtable *rt;
 
        rt = dst_alloc(&ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK,
-                      (nopolicy ? DST_NOPOLICY : 0) |
                       (noxfrm ? DST_NOXFRM : 0));
 
        if (rt) {
@@ -1726,7 +1725,6 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
        struct in_device *in_dev = __in_dev_get_rcu(dev);
        unsigned int flags = RTCF_MULTICAST;
        struct rtable *rth;
-       bool no_policy;
        u32 itag = 0;
        int err;
 
@@ -1737,12 +1735,11 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
        if (our)
                flags |= RTCF_LOCAL;
 
-       no_policy = IN_DEV_ORCONF(in_dev, NOPOLICY);
-       if (no_policy)
+       if (IN_DEV_ORCONF(in_dev, NOPOLICY))
                IPCB(skb)->flags |= IPSKB_NOPOLICY;
 
        rth = rt_dst_alloc(dev_net(dev)->loopback_dev, flags, RTN_MULTICAST,
-                          no_policy, false);
+                          false);
        if (!rth)
                return -ENOBUFS;
 
@@ -1801,7 +1798,7 @@ static int __mkroute_input(struct sk_buff *skb,
        struct rtable *rth;
        int err;
        struct in_device *out_dev;
-       bool do_cache, no_policy;
+       bool do_cache;
        u32 itag = 0;
 
        /* get a working reference to the output device */
@@ -1846,8 +1843,7 @@ static int __mkroute_input(struct sk_buff *skb,
                }
        }
 
-       no_policy = IN_DEV_ORCONF(in_dev, NOPOLICY);
-       if (no_policy)
+       if (IN_DEV_ORCONF(in_dev, NOPOLICY))
                IPCB(skb)->flags |= IPSKB_NOPOLICY;
 
        fnhe = find_exception(nhc, daddr);
@@ -1862,7 +1858,7 @@ static int __mkroute_input(struct sk_buff *skb,
                }
        }
 
-       rth = rt_dst_alloc(out_dev->dev, 0, res->type, no_policy,
+       rth = rt_dst_alloc(out_dev->dev, 0, res->type,
                           IN_DEV_ORCONF(out_dev, NOXFRM));
        if (!rth) {
                err = -ENOBUFS;
@@ -2237,7 +2233,6 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
        struct rtable   *rth;
        struct flowi4   fl4;
        bool do_cache = true;
-       bool no_policy;
 
        /* IP on this device is disabled. */
 
@@ -2356,8 +2351,7 @@ brd_input:
        RT_CACHE_STAT_INC(in_brd);
 
 local_input:
-       no_policy = IN_DEV_ORCONF(in_dev, NOPOLICY);
-       if (no_policy)
+       if (IN_DEV_ORCONF(in_dev, NOPOLICY))
                IPCB(skb)->flags |= IPSKB_NOPOLICY;
 
        do_cache &= res->fi && !itag;
@@ -2373,8 +2367,7 @@ local_input:
        }
 
        rth = rt_dst_alloc(ip_rt_get_dev(net, res),
-                          flags | RTCF_LOCAL, res->type,
-                          no_policy, false);
+                          flags | RTCF_LOCAL, res->type, false);
        if (!rth)
                goto e_nobufs;
 
@@ -2597,7 +2590,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
 
 add:
        rth = rt_dst_alloc(dev_out, flags, type,
-                          IN_DEV_ORCONF(in_dev, NOPOLICY),
                           IN_DEV_ORCONF(in_dev, NOXFRM));
        if (!rth)
                return ERR_PTR(-ENOBUFS);