Pull misc into release branch

[~andy/linux] / net / dccp / ackvec.c

diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 41d34d1babc17da94d874a75878c66cc9fc5cb87..7ac775f9a64b0f27cd2d05455dfe7420ea869faf 100644 (file)
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -21,8 +21,8 @@
 
 #include <net/sock.h>
 
-static kmem_cache_t *dccp_ackvec_slab;
-static kmem_cache_t *dccp_ackvec_record_slab;
+static struct kmem_cache *dccp_ackvec_slab;
+static struct kmem_cache *dccp_ackvec_record_slab;
 
 static struct dccp_ackvec_record *dccp_ackvec_record_new(void)
 {
@@ -68,10 +68,15 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 {
        struct dccp_sock *dp = dccp_sk(sk);
        struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec;
-       int len = av->dccpav_vec_len + 2;
+       /* Figure out how many options do we need to represent the ackvec */
+       const u16 nr_opts = (av->dccpav_vec_len +
+                            DCCP_MAX_ACKVEC_OPT_LEN - 1) /
+                           DCCP_MAX_ACKVEC_OPT_LEN;
+       u16 len = av->dccpav_vec_len + 2 * nr_opts, i;
        struct timeval now;
        u32 elapsed_time;
-       unsigned char *to, *from;
+       const unsigned char *tail, *from;
+       unsigned char *to;
        struct dccp_ackvec_record *avr;
 
        if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
@@ -90,24 +95,37 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 
        DCCP_SKB_CB(skb)->dccpd_opt_len += len;
 
-       to    = skb_push(skb, len);
-       *to++ = DCCPO_ACK_VECTOR_0;
-       *to++ = len;
-
+       to   = skb_push(skb, len);
        len  = av->dccpav_vec_len;
        from = av->dccpav_buf + av->dccpav_buf_head;
+       tail = av->dccpav_buf + DCCP_MAX_ACKVEC_LEN;
+
+       for (i = 0; i < nr_opts; ++i) {
+               int copylen = len;
+
+               if (len > DCCP_MAX_ACKVEC_OPT_LEN)
+                       copylen = DCCP_MAX_ACKVEC_OPT_LEN;
+
+               *to++ = DCCPO_ACK_VECTOR_0;
+               *to++ = copylen + 2;
 
-       /* Check if buf_head wraps */
-       if ((int)av->dccpav_buf_head + len > DCCP_MAX_ACKVEC_LEN) {
-               const u32 tailsize = DCCP_MAX_ACKVEC_LEN - av->dccpav_buf_head;
+               /* Check if buf_head wraps */
+               if (from + copylen > tail) {
+                       const u16 tailsize = tail - from;
 
-               memcpy(to, from, tailsize);
-               to   += tailsize;
-               len  -= tailsize;
-               from = av->dccpav_buf;
+                       memcpy(to, from, tailsize);
+                       to      += tailsize;
+                       len     -= tailsize;
+                       copylen -= tailsize;
+                       from    = av->dccpav_buf;
+               }
+
+               memcpy(to, from, copylen);
+               from += copylen;
+               to   += copylen;
+               len  -= copylen;
        }
 
-       memcpy(to, from, len);
        /*
         *      From RFC 4340, A.2:
         *
@@ -139,7 +157,7 @@ struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
 
        if (av != NULL) {
                av->dccpav_buf_head     = DCCP_MAX_ACKVEC_LEN - 1;
-               av->dccpav_buf_ackno    = DCCP_MAX_SEQNO + 1;
+               av->dccpav_buf_ackno    = UINT48_MAX + 1;
                av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0;
                av->dccpav_time.tv_sec  = 0;
                av->dccpav_time.tv_usec = 0;
@@ -205,7 +223,7 @@ static inline int dccp_ackvec_set_buf_head_state(struct dccp_ackvec *av,
                        gap = -new_head;
                }
                new_head += DCCP_MAX_ACKVEC_LEN;
-       } 
+       }
 
        av->dccpav_buf_head = new_head;
 
@@ -318,7 +336,7 @@ out_duplicate:
 void dccp_ackvector_print(const u64 ackno, const unsigned char *vector, int len)
 {
        dccp_pr_debug_cat("ACK vector len=%d, ackno=%llu |", len,
-                                       (unsigned long long)ackno);
+                        (unsigned long long)ackno);
 
        while (len--) {
                const u8 state = (*vector & DCCP_ACKVEC_STATE_MASK) >> 6;
@@ -463,14 +481,14 @@ int __init dccp_ackvec_init(void)
 {
        dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
                                             sizeof(struct dccp_ackvec), 0,
-                                            SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                            SLAB_HWCACHE_ALIGN, NULL);
        if (dccp_ackvec_slab == NULL)
                goto out_err;
 
        dccp_ackvec_record_slab =
                        kmem_cache_create("dccp_ackvec_record",
                                          sizeof(struct dccp_ackvec_record),
-                                         0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                         0, SLAB_HWCACHE_ALIGN, NULL);
        if (dccp_ackvec_record_slab == NULL)
                goto out_destroy_slab;