1 files changed, 18 insertions, 15 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index f45f2a12f37b..d0362a2de3d3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -457,12 +457,9 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
 }
 
 #define IP_IDENTS_SZ 2048u
-struct ip_ident_bucket {
-        atomic_t        id;
-        u32             stamp32;
-};
 
-static struct ip_ident_bucket *ip_idents __read_mostly;
+static atomic_t *ip_idents __read_mostly;
+static u32 *ip_tstamps __read_mostly;
 
 /* In order to protect privacy, we add a perturbation to identifiers
  * if one generator is seldom used. This makes hard for an attacker
@@ -470,15 +467,16 @@ static struct ip_ident_bucket *ip_idents __read_mostly;
  */
 u32 ip_idents_reserve(u32 hash, int segs)
 {
-        struct ip_ident_bucket *bucket = ip_idents + hash % IP_IDENTS_SZ;
-        u32 old = ACCESS_ONCE(bucket->stamp32);
+        u32 *p_tstamp = ip_tstamps + hash % IP_IDENTS_SZ;
+        atomic_t *p_id = ip_idents + hash % IP_IDENTS_SZ;
+        u32 old = ACCESS_ONCE(*p_tstamp);
         u32 now = (u32)jiffies;
         u32 delta = 0;
 
-        if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
+        if (old != now && cmpxchg(p_tstamp, old, now) == old)
                 delta = prandom_u32_max(now - old);
 
-        return atomic_add_return(segs + delta, &bucket->id) - segs;
+        return atomic_add_return(segs + delta, p_id) - segs;
 }
 EXPORT_SYMBOL(ip_idents_reserve);
 
@@ -749,7 +747,7 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow
                 if (!(n->nud_state & NUD_VALID)) {
                         neigh_event_send(n, NULL);
                 } else {
-                        if (fib_lookup(net, fl4, &res) == 0) {
+                        if (fib_lookup(net, fl4, &res, 0) == 0) {
                                 struct fib_nh *nh = &FIB_RES_NH(res);
 
                                 update_or_create_fnhe(nh, fl4->daddr, new_gw,
@@ -977,7 +975,7 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
                 return;
 
         rcu_read_lock();
-        if (fib_lookup(dev_net(dst->dev), fl4, &res) == 0) {
+        if (fib_lookup(dev_net(dst->dev), fl4, &res, 0) == 0) {
                 struct fib_nh *nh = &FIB_RES_NH(res);
 
                 update_or_create_fnhe(nh, fl4->daddr, 0, mtu,
@@ -1188,7 +1186,7 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt)
                 fl4.flowi4_mark = skb->mark;
 
                 rcu_read_lock();
-                if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res) == 0)
+                if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res, 0) == 0)
                         src = FIB_RES_PREFSRC(dev_net(rt->dst.dev), res);
                 else
                         src = inet_select_addr(rt->dst.dev,
@@ -1718,7 +1716,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
         fl4.daddr = daddr;
         fl4.saddr = saddr;
-        err = fib_lookup(net, &fl4, &res);
+        err = fib_lookup(net, &fl4, &res, 0);
         if (err != 0) {
                 if (!IN_DEV_FORWARD(in_dev))
                         err = -EHOSTUNREACH;
@@ -2097,7 +2095,8 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4)
                         goto out;
                 }
                 if (ipv4_is_local_multicast(fl4->daddr) ||
-                    ipv4_is_lbcast(fl4->daddr)) {
+                    ipv4_is_lbcast(fl4->daddr) ||
+                    fl4->flowi4_proto == IPPROTO_IGMP) {
                         if (!fl4->saddr)
                                 fl4->saddr = inet_select_addr(dev_out, 0,
                                                               RT_SCOPE_LINK);
@@ -2124,7 +2123,7 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4)
                 goto make_route;
         }
 
-        if (fib_lookup(net, fl4, &res)) {
+        if (fib_lookup(net, fl4, &res, 0)) {
                 res.fi = NULL;
                 res.table = NULL;
                 if (fl4->flowi4_oif) {
@@ -2742,6 +2741,10 @@ int __init ip_rt_init(void)
 
         prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
 
+        ip_tstamps = kcalloc(IP_IDENTS_SZ, sizeof(*ip_tstamps), GFP_KERNEL);
+        if (!ip_tstamps)
+                panic("IP: failed to allocate ip_tstamps\n");
+
         for_each_possible_cpu(cpu) {
                 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);