[NETLINK]: Remove unused dst_pid field in netlink_skb_parms
[linux-2.6.git] / net / ipv4 / fib_frontend.c
index cd8e45a..d47b72a 100644 (file)
  *             2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
+#include <linux/capability.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/inet.h>
+#include <linux/inetdevice.h>
 #include <linux/netdevice.h>
+#include <linux/if_addr.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/init.h>
+#include <linux/list.h>
 
 #include <net/ip.h>
 #include <net/protocol.h>
 
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 
-#define RT_TABLE_MIN RT_TABLE_MAIN
-
 struct fib_table *ip_fib_local_table;
 struct fib_table *ip_fib_main_table;
 
-#else
+#define FIB_TABLE_HASHSZ 1
+static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
 
-#define RT_TABLE_MIN 1
+#else
 
-struct fib_table *fib_tables[RT_TABLE_MAX+1];
+#define FIB_TABLE_HASHSZ 256
+static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
 
-struct fib_table *__fib_new_table(int id)
+struct fib_table *fib_new_table(u32 id)
 {
        struct fib_table *tb;
+       unsigned int h;
 
+       if (id == 0)
+               id = RT_TABLE_MAIN;
+       tb = fib_get_table(id);
+       if (tb)
+               return tb;
        tb = fib_hash_init(id);
        if (!tb)
                return NULL;
-       fib_tables[id] = tb;
+       h = id & (FIB_TABLE_HASHSZ - 1);
+       hlist_add_head_rcu(&tb->tb_hlist, &fib_table_hash[h]);
        return tb;
 }
 
+struct fib_table *fib_get_table(u32 id)
+{
+       struct fib_table *tb;
+       struct hlist_node *node;
+       unsigned int h;
 
+       if (id == 0)
+               id = RT_TABLE_MAIN;
+       h = id & (FIB_TABLE_HASHSZ - 1);
+       rcu_read_lock();
+       hlist_for_each_entry_rcu(tb, node, &fib_table_hash[h], tb_hlist) {
+               if (tb->tb_id == id) {
+                       rcu_read_unlock();
+                       return tb;
+               }
+       }
+       rcu_read_unlock();
+       return NULL;
+}
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 
-
 static void fib_flush(void)
 {
        int flushed = 0;
-#ifdef CONFIG_IP_MULTIPLE_TABLES
        struct fib_table *tb;
-       int id;
+       struct hlist_node *node;
+       unsigned int h;
 
-       for (id = RT_TABLE_MAX; id>0; id--) {
-               if ((tb = fib_get_table(id))==NULL)
-                       continue;
-               flushed += tb->tb_flush(tb);
+       for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
+               hlist_for_each_entry(tb, node, &fib_table_hash[h], tb_hlist)
+                       flushed += tb->tb_flush(tb);
        }
-#else /* CONFIG_IP_MULTIPLE_TABLES */
-       flushed += ip_fib_main_table->tb_flush(ip_fib_main_table);
-       flushed += ip_fib_local_table->tb_flush(ip_fib_local_table);
-#endif /* CONFIG_IP_MULTIPLE_TABLES */
 
        if (flushed)
                rt_cache_flush(-1);
@@ -100,7 +122,7 @@ static void fib_flush(void)
  *     Find the first device with a given source address.
  */
 
-struct net_device * ip_dev_find(u32 addr)
+struct net_device * ip_dev_find(__be32 addr)
 {
        struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } };
        struct fib_result res;
@@ -124,7 +146,7 @@ out:
        return dev;
 }
 
-unsigned inet_addr_type(u32 addr)
+unsigned inet_addr_type(__be32 addr)
 {
        struct flowi            fl = { .nl_u = { .ip4_u = { .daddr = addr } } };
        struct fib_result       res;
@@ -158,8 +180,8 @@ unsigned inet_addr_type(u32 addr)
    - check, that packet arrived from expected physical interface.
  */
 
-int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
-                       struct net_device *dev, u32 *spec_dst, u32 *itag)
+int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
+                       struct net_device *dev, __be32 *spec_dst, u32 *itag)
 {
        struct in_device *in_dev;
        struct flowi fl = { .nl_u = { .ip4_u =
@@ -173,7 +195,7 @@ int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
 
        no_addr = rpf = 0;
        rcu_read_lock();
-       in_dev = __in_dev_get(dev);
+       in_dev = __in_dev_get_rcu(dev);
        if (in_dev) {
                no_addr = in_dev->ifa_list == NULL;
                rpf = IN_DEV_RPFILTER(in_dev);
@@ -231,43 +253,190 @@ e_inval:
 
 #ifndef CONFIG_IP_NOSIOCRT
 
+static inline __be32 sk_extract_addr(struct sockaddr *addr)
+{
+       return ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+}
+
+static int put_rtax(struct nlattr *mx, int len, int type, u32 value)
+{
+       struct nlattr *nla;
+
+       nla = (struct nlattr *) ((char *) mx + len);
+       nla->nla_type = type;
+       nla->nla_len = nla_attr_size(4);
+       *(u32 *) nla_data(nla) = value;
+
+       return len + nla_total_size(4);
+}
+
+static int rtentry_to_fib_config(int cmd, struct rtentry *rt,
+                                struct fib_config *cfg)
+{
+       __be32 addr;
+       int plen;
+
+       memset(cfg, 0, sizeof(*cfg));
+
+       if (rt->rt_dst.sa_family != AF_INET)
+               return -EAFNOSUPPORT;
+
+       /*
+        * Check mask for validity:
+        * a) it must be contiguous.
+        * b) destination must have all host bits clear.
+        * c) if application forgot to set correct family (AF_INET),
+        *    reject request unless it is absolutely clear i.e.
+        *    both family and mask are zero.
+        */
+       plen = 32;
+       addr = sk_extract_addr(&rt->rt_dst);
+       if (!(rt->rt_flags & RTF_HOST)) {
+               __be32 mask = sk_extract_addr(&rt->rt_genmask);
+
+               if (rt->rt_genmask.sa_family != AF_INET) {
+                       if (mask || rt->rt_genmask.sa_family)
+                               return -EAFNOSUPPORT;
+               }
+
+               if (bad_mask(mask, addr))
+                       return -EINVAL;
+
+               plen = inet_mask_len(mask);
+       }
+
+       cfg->fc_dst_len = plen;
+       cfg->fc_dst = addr;
+
+       if (cmd != SIOCDELRT) {
+               cfg->fc_nlflags = NLM_F_CREATE;
+               cfg->fc_protocol = RTPROT_BOOT;
+       }
+
+       if (rt->rt_metric)
+               cfg->fc_priority = rt->rt_metric - 1;
+
+       if (rt->rt_flags & RTF_REJECT) {
+               cfg->fc_scope = RT_SCOPE_HOST;
+               cfg->fc_type = RTN_UNREACHABLE;
+               return 0;
+       }
+
+       cfg->fc_scope = RT_SCOPE_NOWHERE;
+       cfg->fc_type = RTN_UNICAST;
+
+       if (rt->rt_dev) {
+               char *colon;
+               struct net_device *dev;
+               char devname[IFNAMSIZ];
+
+               if (copy_from_user(devname, rt->rt_dev, IFNAMSIZ-1))
+                       return -EFAULT;
+
+               devname[IFNAMSIZ-1] = 0;
+               colon = strchr(devname, ':');
+               if (colon)
+                       *colon = 0;
+               dev = __dev_get_by_name(devname);
+               if (!dev)
+                       return -ENODEV;
+               cfg->fc_oif = dev->ifindex;
+               if (colon) {
+                       struct in_ifaddr *ifa;
+                       struct in_device *in_dev = __in_dev_get_rtnl(dev);
+                       if (!in_dev)
+                               return -ENODEV;
+                       *colon = ':';
+                       for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next)
+                               if (strcmp(ifa->ifa_label, devname) == 0)
+                                       break;
+                       if (ifa == NULL)
+                               return -ENODEV;
+                       cfg->fc_prefsrc = ifa->ifa_local;
+               }
+       }
+
+       addr = sk_extract_addr(&rt->rt_gateway);
+       if (rt->rt_gateway.sa_family == AF_INET && addr) {
+               cfg->fc_gw = addr;
+               if (rt->rt_flags & RTF_GATEWAY &&
+                   inet_addr_type(addr) == RTN_UNICAST)
+                       cfg->fc_scope = RT_SCOPE_UNIVERSE;
+       }
+
+       if (cmd == SIOCDELRT)
+               return 0;
+
+       if (rt->rt_flags & RTF_GATEWAY && !cfg->fc_gw)
+               return -EINVAL;
+
+       if (cfg->fc_scope == RT_SCOPE_NOWHERE)
+               cfg->fc_scope = RT_SCOPE_LINK;
+
+       if (rt->rt_flags & (RTF_MTU | RTF_WINDOW | RTF_IRTT)) {
+               struct nlattr *mx;
+               int len = 0;
+
+               mx = kzalloc(3 * nla_total_size(4), GFP_KERNEL);
+               if (mx == NULL)
+                       return -ENOMEM;
+
+               if (rt->rt_flags & RTF_MTU)
+                       len = put_rtax(mx, len, RTAX_ADVMSS, rt->rt_mtu - 40);
+
+               if (rt->rt_flags & RTF_WINDOW)
+                       len = put_rtax(mx, len, RTAX_WINDOW, rt->rt_window);
+
+               if (rt->rt_flags & RTF_IRTT)
+                       len = put_rtax(mx, len, RTAX_RTT, rt->rt_irtt << 3);
+
+               cfg->fc_mx = mx;
+               cfg->fc_mx_len = len;
+       }
+
+       return 0;
+}
+
 /*
  *     Handle IP routing ioctl calls. These are used to manipulate the routing tables
  */
  
 int ip_rt_ioctl(unsigned int cmd, void __user *arg)
 {
+       struct fib_config cfg;
+       struct rtentry rt;
        int err;
-       struct kern_rta rta;
-       struct rtentry  r;
-       struct {
-               struct nlmsghdr nlh;
-               struct rtmsg    rtm;
-       } req;
 
        switch (cmd) {
        case SIOCADDRT:         /* Add a route */
        case SIOCDELRT:         /* Delete a route */
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
-               if (copy_from_user(&r, arg, sizeof(struct rtentry)))
+
+               if (copy_from_user(&rt, arg, sizeof(rt)))
                        return -EFAULT;
+
                rtnl_lock();
-               err = fib_convert_rtentry(cmd, &req.nlh, &req.rtm, &rta, &r);
+               err = rtentry_to_fib_config(cmd, &rt, &cfg);
                if (err == 0) {
+                       struct fib_table *tb;
+
                        if (cmd == SIOCDELRT) {
-                               struct fib_table *tb = fib_get_table(req.rtm.rtm_table);
-                               err = -ESRCH;
+                               tb = fib_get_table(cfg.fc_table);
                                if (tb)
-                                       err = tb->tb_delete(tb, &req.rtm, &rta, &req.nlh, NULL);
+                                       err = tb->tb_delete(tb, &cfg);
+                               else
+                                       err = -ESRCH;
                        } else {
-                               struct fib_table *tb = fib_new_table(req.rtm.rtm_table);
-                               err = -ENOBUFS;
+                               tb = fib_new_table(cfg.fc_table);
                                if (tb)
-                                       err = tb->tb_insert(tb, &req.rtm, &rta, &req.nlh, NULL);
+                                       err = tb->tb_insert(tb, &cfg);
+                               else
+                                       err = -ENOBUFS;
                        }
-                       if (rta.rta_mx)
-                               kfree(rta.rta_mx);
+
+                       /* allocated by rtentry_to_fib_config() */
+                       kfree(cfg.fc_mx);
                }
                rtnl_unlock();
                return err;
@@ -284,77 +453,164 @@ int ip_rt_ioctl(unsigned int cmd, void *arg)
 
 #endif
 
-static int inet_check_attr(struct rtmsg *r, struct rtattr **rta)
+struct nla_policy rtm_ipv4_policy[RTA_MAX+1] __read_mostly = {
+       [RTA_DST]               = { .type = NLA_U32 },
+       [RTA_SRC]               = { .type = NLA_U32 },
+       [RTA_IIF]               = { .type = NLA_U32 },
+       [RTA_OIF]               = { .type = NLA_U32 },
+       [RTA_GATEWAY]           = { .type = NLA_U32 },
+       [RTA_PRIORITY]          = { .type = NLA_U32 },
+       [RTA_PREFSRC]           = { .type = NLA_U32 },
+       [RTA_METRICS]           = { .type = NLA_NESTED },
+       [RTA_MULTIPATH]         = { .len = sizeof(struct rtnexthop) },
+       [RTA_PROTOINFO]         = { .type = NLA_U32 },
+       [RTA_FLOW]              = { .type = NLA_U32 },
+       [RTA_MP_ALGO]           = { .type = NLA_U32 },
+};
+
+static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh,
+                            struct fib_config *cfg)
 {
-       int i;
-
-       for (i=1; i<=RTA_MAX; i++) {
-               struct rtattr *attr = rta[i-1];
-               if (attr) {
-                       if (RTA_PAYLOAD(attr) < 4)
-                               return -EINVAL;
-                       if (i != RTA_MULTIPATH && i != RTA_METRICS)
-                               rta[i-1] = (struct rtattr*)RTA_DATA(attr);
+       struct nlattr *attr;
+       int err, remaining;
+       struct rtmsg *rtm;
+
+       err = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipv4_policy);
+       if (err < 0)
+               goto errout;
+
+       memset(cfg, 0, sizeof(*cfg));
+
+       rtm = nlmsg_data(nlh);
+       cfg->fc_dst_len = rtm->rtm_dst_len;
+       cfg->fc_tos = rtm->rtm_tos;
+       cfg->fc_table = rtm->rtm_table;
+       cfg->fc_protocol = rtm->rtm_protocol;
+       cfg->fc_scope = rtm->rtm_scope;
+       cfg->fc_type = rtm->rtm_type;
+       cfg->fc_flags = rtm->rtm_flags;
+       cfg->fc_nlflags = nlh->nlmsg_flags;
+
+       cfg->fc_nlinfo.pid = NETLINK_CB(skb).pid;
+       cfg->fc_nlinfo.nlh = nlh;
+
+       nlmsg_for_each_attr(attr, nlh, sizeof(struct rtmsg), remaining) {
+               switch (attr->nla_type) {
+               case RTA_DST:
+                       cfg->fc_dst = nla_get_be32(attr);
+                       break;
+               case RTA_OIF:
+                       cfg->fc_oif = nla_get_u32(attr);
+                       break;
+               case RTA_GATEWAY:
+                       cfg->fc_gw = nla_get_be32(attr);
+                       break;
+               case RTA_PRIORITY:
+                       cfg->fc_priority = nla_get_u32(attr);
+                       break;
+               case RTA_PREFSRC:
+                       cfg->fc_prefsrc = nla_get_be32(attr);
+                       break;
+               case RTA_METRICS:
+                       cfg->fc_mx = nla_data(attr);
+                       cfg->fc_mx_len = nla_len(attr);
+                       break;
+               case RTA_MULTIPATH:
+                       cfg->fc_mp = nla_data(attr);
+                       cfg->fc_mp_len = nla_len(attr);
+                       break;
+               case RTA_FLOW:
+                       cfg->fc_flow = nla_get_u32(attr);
+                       break;
+               case RTA_MP_ALGO:
+                       cfg->fc_mp_alg = nla_get_u32(attr);
+                       break;
+               case RTA_TABLE:
+                       cfg->fc_table = nla_get_u32(attr);
+                       break;
                }
        }
+
        return 0;
+errout:
+       return err;
 }
 
 int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
-       struct fib_table * tb;
-       struct rtattr **rta = arg;
-       struct rtmsg *r = NLMSG_DATA(nlh);
+       struct fib_config cfg;
+       struct fib_table *tb;
+       int err;
 
-       if (inet_check_attr(r, rta))
-               return -EINVAL;
+       err = rtm_to_fib_config(skb, nlh, &cfg);
+       if (err < 0)
+               goto errout;
 
-       tb = fib_get_table(r->rtm_table);
-       if (tb)
-               return tb->tb_delete(tb, r, (struct kern_rta*)rta, nlh, &NETLINK_CB(skb));
-       return -ESRCH;
+       tb = fib_get_table(cfg.fc_table);
+       if (tb == NULL) {
+               err = -ESRCH;
+               goto errout;
+       }
+
+       err = tb->tb_delete(tb, &cfg);
+errout:
+       return err;
 }
 
 int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
-       struct fib_table * tb;
-       struct rtattr **rta = arg;
-       struct rtmsg *r = NLMSG_DATA(nlh);
+       struct fib_config cfg;
+       struct fib_table *tb;
+       int err;
 
-       if (inet_check_attr(r, rta))
-               return -EINVAL;
+       err = rtm_to_fib_config(skb, nlh, &cfg);
+       if (err < 0)
+               goto errout;
 
-       tb = fib_new_table(r->rtm_table);
-       if (tb)
-               return tb->tb_insert(tb, r, (struct kern_rta*)rta, nlh, &NETLINK_CB(skb));
-       return -ENOBUFS;
+       tb = fib_new_table(cfg.fc_table);
+       if (tb == NULL) {
+               err = -ENOBUFS;
+               goto errout;
+       }
+
+       err = tb->tb_insert(tb, &cfg);
+errout:
+       return err;
 }
 
 int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 {
-       int t;
-       int s_t;
+       unsigned int h, s_h;
+       unsigned int e = 0, s_e;
        struct fib_table *tb;
+       struct hlist_node *node;
+       int dumped = 0;
 
-       if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
-           ((struct rtmsg*)NLMSG_DATA(cb->nlh))->rtm_flags&RTM_F_CLONED)
+       if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&
+           ((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED)
                return ip_rt_dump(skb, cb);
 
-       s_t = cb->args[0];
-       if (s_t == 0)
-               s_t = cb->args[0] = RT_TABLE_MIN;
-
-       for (t=s_t; t<=RT_TABLE_MAX; t++) {
-               if (t < s_t) continue;
-               if (t > s_t)
-                       memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));
-               if ((tb = fib_get_table(t))==NULL)
-                       continue;
-               if (tb->tb_dump(tb, skb, cb) < 0) 
-                       break;
+       s_h = cb->args[0];
+       s_e = cb->args[1];
+
+       for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) {
+               e = 0;
+               hlist_for_each_entry(tb, node, &fib_table_hash[h], tb_hlist) {
+                       if (e < s_e)
+                               goto next;
+                       if (dumped)
+                               memset(&cb->args[2], 0, sizeof(cb->args) -
+                                                2 * sizeof(cb->args[0]));
+                       if (tb->tb_dump(tb, skb, cb) < 0)
+                               goto out;
+                       dumped = 1;
+next:
+                       e++;
+               }
        }
-
-       cb->args[0] = t;
+out:
+       cb->args[1] = e;
+       cb->args[0] = h;
 
        return skb->len;
 }
@@ -366,17 +622,18 @@ int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
    only when netlink is already locked.
  */
 
-static void fib_magic(int cmd, int type, u32 dst, int dst_len, struct in_ifaddr *ifa)
+static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifaddr *ifa)
 {
-       struct fib_table * tb;
-       struct {
-               struct nlmsghdr nlh;
-               struct rtmsg    rtm;
-       } req;
-       struct kern_rta rta;
-
-       memset(&req.rtm, 0, sizeof(req.rtm));
-       memset(&rta, 0, sizeof(rta));
+       struct fib_table *tb;
+       struct fib_config cfg = {
+               .fc_protocol = RTPROT_KERNEL,
+               .fc_type = type,
+               .fc_dst = dst,
+               .fc_dst_len = dst_len,
+               .fc_prefsrc = ifa->ifa_local,
+               .fc_oif = ifa->ifa_dev->dev->ifindex,
+               .fc_nlflags = NLM_F_CREATE | NLM_F_APPEND,
+       };
 
        if (type == RTN_UNICAST)
                tb = fib_new_table(RT_TABLE_MAIN);
@@ -386,36 +643,27 @@ static void fib_magic(int cmd, int type, u32 dst, int dst_len, struct in_ifaddr
        if (tb == NULL)
                return;
 
-       req.nlh.nlmsg_len = sizeof(req);
-       req.nlh.nlmsg_type = cmd;
-       req.nlh.nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE|NLM_F_APPEND;
-       req.nlh.nlmsg_pid = 0;
-       req.nlh.nlmsg_seq = 0;
+       cfg.fc_table = tb->tb_id;
 
-       req.rtm.rtm_dst_len = dst_len;
-       req.rtm.rtm_table = tb->tb_id;
-       req.rtm.rtm_protocol = RTPROT_KERNEL;
-       req.rtm.rtm_scope = (type != RTN_LOCAL ? RT_SCOPE_LINK : RT_SCOPE_HOST);
-       req.rtm.rtm_type = type;
-
-       rta.rta_dst = &dst;
-       rta.rta_prefsrc = &ifa->ifa_local;
-       rta.rta_oif = &ifa->ifa_dev->dev->ifindex;
+       if (type != RTN_LOCAL)
+               cfg.fc_scope = RT_SCOPE_LINK;
+       else
+               cfg.fc_scope = RT_SCOPE_HOST;
 
        if (cmd == RTM_NEWROUTE)
-               tb->tb_insert(tb, &req.rtm, &rta, &req.nlh, NULL);
+               tb->tb_insert(tb, &cfg);
        else
-               tb->tb_delete(tb, &req.rtm, &rta, &req.nlh, NULL);
+               tb->tb_delete(tb, &cfg);
 }
 
-static void fib_add_ifaddr(struct in_ifaddr *ifa)
+void fib_add_ifaddr(struct in_ifaddr *ifa)
 {
        struct in_device *in_dev = ifa->ifa_dev;
        struct net_device *dev = in_dev->dev;
        struct in_ifaddr *prim = ifa;
-       u32 mask = ifa->ifa_mask;
-       u32 addr = ifa->ifa_local;
-       u32 prefix = ifa->ifa_address&mask;
+       __be32 mask = ifa->ifa_mask;
+       __be32 addr = ifa->ifa_local;
+       __be32 prefix = ifa->ifa_address&mask;
 
        if (ifa->ifa_flags&IFA_F_SECONDARY) {
                prim = inet_ifa_byprefix(in_dev, prefix, mask);
@@ -431,7 +679,7 @@ static void fib_add_ifaddr(struct in_ifaddr *ifa)
                return;
 
        /* Add broadcast address, if it is explicitly assigned. */
-       if (ifa->ifa_broadcast && ifa->ifa_broadcast != 0xFFFFFFFF)
+       if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF))
                fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, prim);
 
        if (!ZERONET(prefix) && !(ifa->ifa_flags&IFA_F_SECONDARY) &&
@@ -453,8 +701,8 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
        struct net_device *dev = in_dev->dev;
        struct in_ifaddr *ifa1;
        struct in_ifaddr *prim = ifa;
-       u32 brd = ifa->ifa_address|~ifa->ifa_mask;
-       u32 any = ifa->ifa_address&ifa->ifa_mask;
+       __be32 brd = ifa->ifa_address|~ifa->ifa_mask;
+       __be32 any = ifa->ifa_address&ifa->ifa_mask;
 #define LOCAL_OK       1
 #define BRD_OK         2
 #define BRD0_OK                4
@@ -520,8 +768,8 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 {
        
        struct fib_result       res;
-       struct flowi            fl = { .nl_u = { .ip4_u = { .daddr = frn->fl_addr, 
-                                                           .fwmark = frn->fl_fwmark,
+       struct flowi            fl = { .mark = frn->fl_mark,
+                                      .nl_u = { .ip4_u = { .daddr = frn->fl_addr,
                                                            .tos = frn->fl_tos,
                                                            .scope = frn->fl_scope } } };
        if (tb) {
@@ -545,12 +793,16 @@ static void nl_fib_input(struct sock *sk, int len)
        struct sk_buff *skb = NULL;
         struct nlmsghdr *nlh = NULL;
        struct fib_result_nl *frn;
-       int err;
        u32 pid;     
        struct fib_table *tb;
        
-       skb = skb_recv_datagram(sk, 0, 0, &err);
+       skb = skb_dequeue(&sk->sk_receive_queue);
        nlh = (struct nlmsghdr *)skb->data;
+       if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len ||
+           nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) {
+               kfree_skb(skb);
+               return;
+       }
        
        frn = (struct fib_result_nl *) NLMSG_DATA(nlh);
        tb = fib_get_table(frn->tb_id_in);
@@ -558,16 +810,14 @@ static void nl_fib_input(struct sock *sk, int len)
        nl_fib_lookup(frn, tb);
        
        pid = nlh->nlmsg_pid;           /*pid of sending process */
-       NETLINK_CB(skb).groups = 0;     /* not in mcast group */
        NETLINK_CB(skb).pid = 0;         /* from kernel */
-       NETLINK_CB(skb).dst_pid = pid;
-       NETLINK_CB(skb).dst_groups = 0;  /* unicast */
+       NETLINK_CB(skb).dst_group = 0;  /* unicast */
        netlink_unicast(sk, skb, pid, MSG_DONTWAIT);
 }    
 
 static void nl_fib_lookup_init(void)
 {
-      netlink_kernel_create(NETLINK_FIB_LOOKUP, nl_fib_input);
+      netlink_kernel_create(NETLINK_FIB_LOOKUP, 0, nl_fib_input, THIS_MODULE);
 }
 
 static void fib_disable_ip(struct net_device *dev, int force)
@@ -592,7 +842,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
                break;
        case NETDEV_DOWN:
                fib_del_ifaddr(ifa);
-               if (ifa->ifa_dev && ifa->ifa_dev->ifa_list == NULL) {
+               if (ifa->ifa_dev->ifa_list == NULL) {
                        /* Last address was deleted from this interface.
                           Disable IP.
                         */
@@ -608,7 +858,7 @@ 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 = __in_dev_get(dev);
+       struct in_device *in_dev = __in_dev_get_rtnl(dev);
 
        if (event == NETDEV_UNREGISTER) {
                fib_disable_ip(dev, 2);
@@ -649,11 +899,17 @@ static struct notifier_block fib_netdev_notifier = {
 
 void __init ip_fib_init(void)
 {
+       unsigned int i;
+
+       for (i = 0; i < FIB_TABLE_HASHSZ; i++)
+               INIT_HLIST_HEAD(&fib_table_hash[i]);
 #ifndef CONFIG_IP_MULTIPLE_TABLES
        ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
+       hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
        ip_fib_main_table  = fib_hash_init(RT_TABLE_MAIN);
+       hlist_add_head_rcu(&ip_fib_main_table->tb_hlist, &fib_table_hash[0]);
 #else
-       fib_rules_init();
+       fib4_rules_init();
 #endif
 
        register_netdevice_notifier(&fib_netdev_notifier);
@@ -663,4 +919,3 @@ void __init ip_fib_init(void)
 
 EXPORT_SYMBOL(inet_addr_type);
 EXPORT_SYMBOL(ip_dev_find);
-EXPORT_SYMBOL(ip_rt_ioctl);