Merge branch 'linus'

1 files changed, 9 insertions, 6 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c701f6abbfc1..c26076fb890e 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1011,10 +1011,11 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
                         for (j = 0; j < i; j++){
                                 if (after(ntohl(sp[j].start_seq),
                                           ntohl(sp[j+1].start_seq))){
-                                        sp[j].start_seq = htonl(tp->recv_sack_cache[j+1].start_seq);
-                                        sp[j].end_seq = htonl(tp->recv_sack_cache[j+1].end_seq);
-                                        sp[j+1].start_seq = htonl(tp->recv_sack_cache[j].start_seq);
-                                        sp[j+1].end_seq = htonl(tp->recv_sack_cache[j].end_seq);
+                                        struct tcp_sack_block_wire tmp;
+
+                                        tmp = sp[j];
+                                        sp[j] = sp[j+1];
+                                        sp[j+1] = tmp;
                                 }
 
                         }
@@ -4420,9 +4421,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                          * But, this leaves one open to an easy denial of
                          * service attack, and SYN cookies can't defend
                          * against this problem. So, we drop the data
-                         * in the interest of security over speed.
+                         * in the interest of security over speed unless
+                         * it's still in use.
                          */
-                        goto discard;
+                        kfree_skb(skb);
+                        return 0;
                 }
                 goto discard;