[NET]: Introduce RTA_TABLE/FRA_TABLE attributes

Introduce RTA_TABLE route attribute and FRA_TABLE routing rule attribute
to hold 32 bit routing table IDs. Usespace compatibility is provided by
continuing to accept and send the rtm_table field, but because of its
limited size it can only carry the low 8 bits of the table ID. This
implies that if larger IDs are used, _all_ userspace programs using them
need to use RTA_TABLE.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 06f4b23f6f57..2696ede52de2 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -294,7 +294,8 @@ static int inet_check_attr(struct rtmsg *r, struct rtattr **rta)
                 if (attr) {
                         if (RTA_PAYLOAD(attr) < 4)
                                 return -EINVAL;
-                        if (i != RTA_MULTIPATH && i != RTA_METRICS)
+                        if (i != RTA_MULTIPATH && i != RTA_METRICS &&
+                            i != RTA_TABLE)
                                 *rta = (struct rtattr*)RTA_DATA(attr);
                 }
         }
@@ -310,7 +311,7 @@ int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
         if (inet_check_attr(r, rta))
                 return -EINVAL;
 
-        tb = fib_get_table(r->rtm_table);
+        tb = fib_get_table(rtm_get_table(rta, r->rtm_table));
         if (tb)
                 return tb->tb_delete(tb, r, (struct kern_rta*)rta, nlh, &NETLINK_CB(skb));
         return -ESRCH;
@@ -325,7 +326,7 @@ int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
         if (inet_check_attr(r, rta))
                 return -EINVAL;
 
-        tb = fib_new_table(r->rtm_table);
+        tb = fib_new_table(rtm_get_table(rta, r->rtm_table));
         if (tb)
                 return tb->tb_insert(tb, r, (struct kern_rta*)rta, nlh, &NETLINK_CB(skb));
         return -ENOBUFS;