6 files changed, 88 insertions, 29 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 9d4555ec0b59..8219b7e0968d 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -96,7 +96,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
 
         ah->reserved = 0;
         ah->spi = x->id.spi;
-        ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
+        ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
 
         spin_lock_bh(&x->lock);
         err = ah_mac_digest(ahp, skb, ah->auth_data);
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 8e17f65f4002..c663fa5339ee 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -368,7 +368,6 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
                 if (!(neigh->nud_state&NUD_VALID))
                         printk(KERN_DEBUG "trying to ucast probe in NUD_INVALID\n");
                 dst_ha = neigh->ha;
-                read_lock_bh(&neigh->lock);
         } else if ((probes -= neigh->parms->app_probes) < 0) {
 #ifdef CONFIG_ARPD
                 neigh_app_ns(neigh);
@@ -378,8 +377,6 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
 
         arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr,
                  dst_ha, dev->dev_addr, NULL);
-        if (dst_ha)
-                read_unlock_bh(&neigh->lock);
 }
 
 static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 258d17631b4b..091e6709f831 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -199,7 +199,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         }
 
         esph->spi = x->id.spi;
-        esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
+        esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
 
         sg_init_table(sg, nfrags);
         skb_to_sgvec(skb, sg,
@@ -210,7 +210,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         aead_givcrypt_set_callback(req, 0, esp_output_done, skb);
         aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
         aead_givcrypt_set_assoc(req, asg, sizeof(*esph));
-        aead_givcrypt_set_giv(req, esph->enc_data, XFRM_SKB_CB(skb)->seq);
+        aead_givcrypt_set_giv(req, esph->enc_data,
+                              XFRM_SKB_CB(skb)->seq.output);
 
         ESP_SKB_CB(skb)->tmp = tmp;
         err = crypto_aead_givencrypt(req);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index f5fba3f71c06..1ff446d0fa8b 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1762,11 +1762,9 @@ static struct leaf *trie_leafindex(struct trie *t, int index)
 {
         struct leaf *l = trie_firstleaf(t);
 
-        while (index-- > 0) {
+        while (l && index-- > 0)
                 l = trie_nextleaf(l);
-                if (!l)
-                        break;
-        }
+
         return l;
 }
 
@@ -2461,6 +2459,84 @@ static const struct file_operations fib_trie_fops = {
         .release = seq_release_net,
 };
 
+struct fib_route_iter {
+        struct seq_net_private p;
+        struct trie *main_trie;
+        loff_t  pos;
+        t_key   key;
+};
+
+static struct leaf *fib_route_get_idx(struct fib_route_iter *iter, loff_t pos)
+{
+        struct leaf *l = NULL;
+        struct trie *t = iter->main_trie;
+
+        /* use cache location of last found key */
+        if (iter->pos > 0 && pos >= iter->pos && (l = fib_find_node(t, iter->key)))
+                pos -= iter->pos;
+        else {
+                iter->pos = 0;
+                l = trie_firstleaf(t);
+        }
+
+        while (l && pos-- > 0) {
+                iter->pos++;
+                l = trie_nextleaf(l);
+        }
+
+        if (l)
+                iter->key = pos;        /* remember it */
+        else
+                iter->pos = 0;          /* forget it */
+
+        return l;
+}
+
+static void *fib_route_seq_start(struct seq_file *seq, loff_t *pos)
+        __acquires(RCU)
+{
+        struct fib_route_iter *iter = seq->private;
+        struct fib_table *tb;
+
+        rcu_read_lock();
+        tb = fib_get_table(iter->p.net, RT_TABLE_MAIN);
+        if (!tb)
+                return NULL;
+
+        iter->main_trie = (struct trie *) tb->tb_data;
+        if (*pos == 0)
+                return SEQ_START_TOKEN;
+        else
+                return fib_route_get_idx(iter, *pos - 1);
+}
+
+static void *fib_route_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        struct fib_route_iter *iter = seq->private;
+        struct leaf *l = v;
+
+        ++*pos;
+        if (v == SEQ_START_TOKEN) {
+                iter->pos = 0;
+                l = trie_firstleaf(iter->main_trie);
+        } else {
+                iter->pos++;
+                l = trie_nextleaf(l);
+        }
+
+        if (l)
+                iter->key = l->key;
+        else
+                iter->pos = 0;
+        return l;
+}
+
+static void fib_route_seq_stop(struct seq_file *seq, void *v)
+        __releases(RCU)
+{
+        rcu_read_unlock();
+}
+
 static unsigned fib_flag_trans(int type, __be32 mask, const struct fib_info *fi)
 {
         static unsigned type2flags[RTN_MAX + 1] = {
@@ -2484,7 +2560,6 @@ static unsigned fib_flag_trans(int type, __be32 mask, const struct fib_info *fi)
  */
 static int fib_route_seq_show(struct seq_file *seq, void *v)
 {
-        const struct fib_trie_iter *iter = seq->private;
         struct leaf *l = v;
         struct leaf_info *li;
         struct hlist_node *node;
@@ -2496,12 +2571,6 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
                 return 0;
         }
 
-        if (iter->trie == iter->trie_local)
-                return 0;
-
-        if (IS_TNODE(l))
-                return 0;
-
         hlist_for_each_entry_rcu(li, node, &l->list, hlist) {
                 struct fib_alias *fa;
                 __be32 mask, prefix;
@@ -2544,16 +2613,16 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
 }
 
 static const struct seq_operations fib_route_seq_ops = {
-        .start  = fib_trie_seq_start,
-        .next   = fib_trie_seq_next,
-        .stop   = fib_trie_seq_stop,
+        .start  = fib_route_seq_start,
+        .next   = fib_route_seq_next,
+        .stop   = fib_route_seq_stop,
         .show   = fib_route_seq_show,
 };
 
 static int fib_route_seq_open(struct inode *inode, struct file *file)
 {
         return seq_open_net(inode, file, &fib_route_seq_ops,
-                            sizeof(struct fib_trie_iter));
+                            sizeof(struct fib_route_iter));
 }
 
 static const struct file_operations fib_route_fops = {
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 9cac6c034abd..1aba606f6bbb 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -120,8 +120,6 @@ void inet_listen_wlock(struct inet_hashinfo *hashinfo)
         }
 }
 
-EXPORT_SYMBOL(inet_listen_wlock);
-
 /*
  * Don't inline this cruft. Here are some nice properties to exploit here. The
  * BSD API does not allow a listening sock to specify the remote port nor the
@@ -494,7 +492,6 @@ out:
                 return ret;
         }
 }
-EXPORT_SYMBOL_GPL(__inet_hash_connect);
 
 /*
  * Bind a port for a connect operation and hash it.
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 754b0a5bbfe9..de0572c88859 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -514,11 +514,6 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         val &= ~3;
                         val |= inet->tos & 3;
                 }
-                if (IPTOS_PREC(val) >= IPTOS_PREC_CRITIC_ECP &&
-                    !capable(CAP_NET_ADMIN)) {
-                        err = -EPERM;
-                        break;
-                }
                 if (inet->tos != val) {
                         inet->tos = val;
                         sk->sk_priority = rt_tos2priority(val);