1 files changed, 71 insertions, 117 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 5cd75e2dab2..92fc5f69f5d 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -15,6 +15,7 @@
 
 #include <linux/module.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 #include <linux/bitops.h>
 #include <linux/capability.h>
 #include <linux/types.h>
@@ -31,7 +32,6 @@
 #include <linux/if_addr.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
-#include <linux/cache.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/slab.h>
@@ -86,24 +86,6 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
         tb = fib_trie_table(id);
         if (!tb)
                 return NULL;
-
-        switch (id) {
-        case RT_TABLE_LOCAL:
-                net->ipv4.fib_local = tb;
-                break;
-
-        case RT_TABLE_MAIN:
-                net->ipv4.fib_main = tb;
-                break;
-
-        case RT_TABLE_DEFAULT:
-                net->ipv4.fib_default = tb;
-                break;
-
-        default:
-                break;
-        }
-
         h = id & (FIB_TABLE_HASHSZ - 1);
         hlist_add_head_rcu(&tb->tb_hlist, &net->ipv4.fib_table_hash[h]);
         return tb;
@@ -148,20 +130,20 @@ static void fib_flush(struct net *net)
         }
 
         if (flushed)
-                rt_cache_flush(net);
+                rt_cache_flush(net, -1);
 }
 
 /*
  * Find address type as if only "dev" was present in the system. If
  * on_dev is NULL then all interfaces are taken into consideration.
  */
-static inline unsigned int __inet_dev_addr_type(struct net *net,
-                                                const struct net_device *dev,
-                                                __be32 addr)
+static inline unsigned __inet_dev_addr_type(struct net *net,
+                                            const struct net_device *dev,
+                                            __be32 addr)
 {
         struct flowi4           fl4 = { .daddr = addr };
         struct fib_result       res;
-        unsigned int ret = RTN_BROADCAST;
+        unsigned ret = RTN_BROADCAST;
         struct fib_table *local_table;
 
         if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
@@ -169,6 +151,10 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,
         if (ipv4_is_multicast(addr))
                 return RTN_MULTICAST;
 
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+        res.r = NULL;
+#endif
+
         local_table = fib_get_table(net, RT_TABLE_LOCAL);
         if (local_table) {
                 ret = RTN_UNICAST;
@@ -195,44 +181,6 @@ unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,
 }
 EXPORT_SYMBOL(inet_dev_addr_type);
 
-__be32 fib_compute_spec_dst(struct sk_buff *skb)
-{
-        struct net_device *dev = skb->dev;
-        struct in_device *in_dev;
-        struct fib_result res;
-        struct rtable *rt;
-        struct flowi4 fl4;
-        struct net *net;
-        int scope;
-
-        rt = skb_rtable(skb);
-        if ((rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST | RTCF_LOCAL)) ==
-            RTCF_LOCAL)
-                return ip_hdr(skb)->daddr;
-
-        in_dev = __in_dev_get_rcu(dev);
-        BUG_ON(!in_dev);
-
-        net = dev_net(dev);
-
-        scope = RT_SCOPE_UNIVERSE;
-        if (!ipv4_is_zeronet(ip_hdr(skb)->saddr)) {
-                fl4.flowi4_oif = 0;
-                fl4.flowi4_iif = LOOPBACK_IFINDEX;
-                fl4.daddr = ip_hdr(skb)->saddr;
-                fl4.saddr = 0;
-                fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
-                fl4.flowi4_scope = scope;
-                fl4.flowi4_mark = IN_DEV_SRC_VMARK(in_dev) ? skb->mark : 0;
-                if (!fib_lookup(net, &fl4, &res))
-                        return FIB_RES_PREFSRC(net, res);
-        } else {
-                scope = RT_SCOPE_LINK;
-        }
-
-        return inet_select_addr(dev, ip_hdr(skb)->saddr, scope);
-}
-
 /* Given (packet source, input interface) and optional (dst, oif, tos):
  * - (main) check, that source is valid i.e. not broadcast or our local
  *   address.
@@ -241,15 +189,17 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
  * - check, that packet arrived from expected physical interface.
  * called with rcu_read_lock()
  */
-static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
-                                 u8 tos, int oif, struct net_device *dev,
-                                 int rpf, struct in_device *idev, u32 *itag)
+int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
+                        int oif, struct net_device *dev, __be32 *spec_dst,
+                        u32 *itag)
 {
-        int ret, no_addr, accept_local;
-        struct fib_result res;
+        struct in_device *in_dev;
         struct flowi4 fl4;
-        struct net *net;
+        struct fib_result res;
+        int no_addr, rpf, accept_local;
         bool dev_match;
+        int ret;
+        struct net *net;
 
         fl4.flowi4_oif = 0;
         fl4.flowi4_iif = oif;
@@ -258,10 +208,20 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
         fl4.flowi4_tos = tos;
         fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
 
-        no_addr = idev->ifa_list == NULL;
+        no_addr = rpf = accept_local = 0;
+        in_dev = __in_dev_get_rcu(dev);
+        if (in_dev) {
+                no_addr = in_dev->ifa_list == NULL;
+
+                /* Ignore rp_filter for packets protected by IPsec. */
+                rpf = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(in_dev);
+
+                accept_local = IN_DEV_ACCEPT_LOCAL(in_dev);
+                fl4.flowi4_mark = IN_DEV_SRC_VMARK(in_dev) ? skb->mark : 0;
+        }
 
-        accept_local = IN_DEV_ACCEPT_LOCAL(idev);
-        fl4.flowi4_mark = IN_DEV_SRC_VMARK(idev) ? skb->mark : 0;
+        if (in_dev == NULL)
+                goto e_inval;
 
         net = dev_net(dev);
         if (fib_lookup(net, &fl4, &res))
@@ -270,6 +230,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
                 if (res.type != RTN_LOCAL || !accept_local)
                         goto e_inval;
         }
+        *spec_dst = FIB_RES_PREFSRC(net, res);
         fib_combine_itag(itag, &res);
         dev_match = false;
 
@@ -298,14 +259,17 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
 
         ret = 0;
         if (fib_lookup(net, &fl4, &res) == 0) {
-                if (res.type == RTN_UNICAST)
+                if (res.type == RTN_UNICAST) {
+                        *spec_dst = FIB_RES_PREFSRC(net, res);
                         ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
+                }
         }
         return ret;
 
 last_resort:
         if (rpf)
                 goto e_rpf;
+        *spec_dst = inet_select_addr(dev, 0, RT_SCOPE_UNIVERSE);
         *itag = 0;
         return 0;
 
@@ -315,21 +279,6 @@ e_rpf:
         return -EXDEV;
 }
 
-/* Ignore rp_filter for packets protected by IPsec. */
-int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
-                        u8 tos, int oif, struct net_device *dev,
-                        struct in_device *idev, u32 *itag)
-{
-        int r = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(idev);
-
-        if (!r && !fib_num_tclassid_users(dev_net(dev)) &&
-            (dev->ifindex != oif || !IN_DEV_TX_REDIRECTS(idev))) {
-                *itag = 0;
-                return 0;
-        }
-        return __fib_validate_source(skb, src, dst, tos, oif, dev, r, idev, itag);
-}
-
 static inline __be32 sk_extract_addr(struct sockaddr *addr)
 {
         return ((struct sockaddr_in *) addr)->sin_addr.s_addr;
@@ -488,7 +437,7 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg)
         switch (cmd) {
         case SIOCADDRT:         /* Add a route */
         case SIOCDELRT:         /* Delete a route */
-                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
+                if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
                 if (copy_from_user(&rt, arg, sizeof(rt)))
@@ -558,7 +507,7 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,
         cfg->fc_flags = rtm->rtm_flags;
         cfg->fc_nlflags = nlh->nlmsg_flags;
 
-        cfg->fc_nlinfo.portid = NETLINK_CB(skb).portid;
+        cfg->fc_nlinfo.pid = NETLINK_CB(skb).pid;
         cfg->fc_nlinfo.nlh = nlh;
         cfg->fc_nlinfo.nl_net = net;
 
@@ -746,7 +695,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
         if (ifa->ifa_flags & IFA_F_SECONDARY) {
                 prim = inet_ifa_byprefix(in_dev, prefix, mask);
                 if (prim == NULL) {
-                        pr_warn("%s: bug: prim == NULL\n", __func__);
+                        printk(KERN_WARNING "fib_add_ifaddr: bug: prim == NULL\n");
                         return;
                 }
         }
@@ -792,7 +741,7 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
 #define BRD_OK          2
 #define BRD0_OK         4
 #define BRD1_OK         8
-        unsigned int ok = 0;
+        unsigned ok = 0;
         int subnet = 0;         /* Primary network */
         int gone = 1;           /* Address is missing */
         int same_prefsrc = 0;   /* Another primary with same IP */
@@ -800,11 +749,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
         if (ifa->ifa_flags & IFA_F_SECONDARY) {
                 prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
                 if (prim == NULL) {
-                        pr_warn("%s: bug: prim == NULL\n", __func__);
+                        printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");
                         return;
                 }
                 if (iprim && iprim != prim) {
-                        pr_warn("%s: bug: iprim != prim\n", __func__);
+                        printk(KERN_WARNING "fib_del_ifaddr: bug: iprim != prim\n");
                         return;
                 }
         } else if (!ipv4_is_zeronet(any) &&
@@ -931,6 +880,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb)
                 .flowi4_scope = frn->fl_scope,
         };
 
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+        res.r = NULL;
+#endif
+
         frn->err = -ENOENT;
         if (tb) {
                 local_bh_disable();
@@ -956,7 +909,7 @@ static void nl_fib_input(struct sk_buff *skb)
         struct fib_result_nl *frn;
         struct nlmsghdr *nlh;
         struct fib_table *tb;
-        u32 portid;
+        u32 pid;
 
         net = sock_net(skb->sk);
         nlh = nlmsg_hdr(skb);
@@ -974,20 +927,17 @@ static void nl_fib_input(struct sk_buff *skb)
 
         nl_fib_lookup(frn, tb);
 
-        portid = NETLINK_CB(skb).portid;      /* pid of sending process */
-        NETLINK_CB(skb).portid = 0;        /* from kernel */
+        pid = NETLINK_CB(skb).pid;      /* pid of sending process */
+        NETLINK_CB(skb).pid = 0;        /* from kernel */
         NETLINK_CB(skb).dst_group = 0;  /* unicast */
-        netlink_unicast(net->ipv4.fibnl, skb, portid, MSG_DONTWAIT);
+        netlink_unicast(net->ipv4.fibnl, skb, pid, MSG_DONTWAIT);
 }
 
 static int __net_init nl_fib_lookup_init(struct net *net)
 {
         struct sock *sk;
-        struct netlink_kernel_cfg cfg = {
-                .input  = nl_fib_input,
-        };
-
-        sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, &cfg);
+        sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, 0,
+                                   nl_fib_input, NULL, THIS_MODULE);
         if (sk == NULL)
                 return -EAFNOSUPPORT;
         net->ipv4.fibnl = sk;
@@ -1000,11 +950,11 @@ static void nl_fib_lookup_exit(struct net *net)
         net->ipv4.fibnl = NULL;
 }
 
-static void fib_disable_ip(struct net_device *dev, int force)
+static void fib_disable_ip(struct net_device *dev, int force, int delay)
 {
         if (fib_sync_down_dev(dev, force))
                 fib_flush(dev_net(dev));
-        rt_cache_flush(dev_net(dev));
+        rt_cache_flush(dev_net(dev), delay);
         arp_ifdown(dev);
 }
 
@@ -1021,7 +971,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
                 fib_sync_up(dev);
 #endif
                 atomic_inc(&net->ipv4.dev_addr_genid);
-                rt_cache_flush(dev_net(dev));
+                rt_cache_flush(dev_net(dev), -1);
                 break;
         case NETDEV_DOWN:
                 fib_del_ifaddr(ifa, NULL);
@@ -1030,9 +980,9 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
                         /* Last address was deleted from this interface.
                          * Disable IP.
                          */
-                        fib_disable_ip(dev, 1);
+                        fib_disable_ip(dev, 1, 0);
                 } else {
-                        rt_cache_flush(dev_net(dev));
+                        rt_cache_flush(dev_net(dev), -1);
                 }
                 break;
         }
@@ -1042,16 +992,16 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
 static int fib_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
         struct net_device *dev = ptr;
-        struct in_device *in_dev;
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
         struct net *net = dev_net(dev);
 
         if (event == NETDEV_UNREGISTER) {
-                fib_disable_ip(dev, 2);
-                rt_flush_dev(dev);
+                fib_disable_ip(dev, 2, -1);
                 return NOTIFY_DONE;
         }
 
-        in_dev = __in_dev_get_rtnl(dev);
+        if (!in_dev)
+                return NOTIFY_DONE;
 
         switch (event) {
         case NETDEV_UP:
@@ -1062,14 +1012,21 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
                 fib_sync_up(dev);
 #endif
                 atomic_inc(&net->ipv4.dev_addr_genid);
-                rt_cache_flush(net);
+                rt_cache_flush(dev_net(dev), -1);
                 break;
         case NETDEV_DOWN:
-                fib_disable_ip(dev, 0);
+                fib_disable_ip(dev, 0, 0);
                 break;
         case NETDEV_CHANGEMTU:
         case NETDEV_CHANGE:
-                rt_cache_flush(net);
+                rt_cache_flush(dev_net(dev), 0);
+                break;
+        case NETDEV_UNREGISTER_BATCH:
+                /* The batch unregister is only called on the first
+                 * device in the list of devices being unregistered.
+                 * Therefore we should not pass dev_net(dev) in here.
+                 */
+                rt_cache_flush_batch(NULL);
                 break;
         }
         return NOTIFY_DONE;
@@ -1134,9 +1091,6 @@ static int __net_init fib_net_init(struct net *net)
 {
         int error;
 
-#ifdef CONFIG_IP_ROUTE_CLASSID
-        net->ipv4.fib_num_tclassid_users = 0;
-#endif
         error = ip_fib_net_init(net);
         if (error < 0)
                 goto out;