1 files changed, 7 insertions, 11 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index efc6fef692ff..277d71239d75 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -536,12 +536,15 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
                 if (sock_owned_by_user(sk))
                         break;
 
+                skb = tcp_rtx_queue_head(sk);
+                if (WARN_ON_ONCE(!skb))
+                        break;
+
                 icsk->icsk_backoff--;
                 icsk->icsk_rto = tp->srtt_us ? __tcp_set_rto(tp) :
                                                TCP_TIMEOUT_INIT;
                 icsk->icsk_rto = inet_csk_rto_backoff(icsk, TCP_RTO_MAX);
 
-                skb = tcp_rtx_queue_head(sk);
 
                 tcp_mstamp_refresh(tp);
                 delta_us = (u32)(tp->tcp_mstamp - tcp_skb_timestamp_us(skb));
@@ -970,7 +973,7 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)
  * We need to maintain these in the sk structure.
  */
 
-struct static_key tcp_md5_needed __read_mostly;
+DEFINE_STATIC_KEY_FALSE(tcp_md5_needed);
 EXPORT_SYMBOL(tcp_md5_needed);
 
 /* Find the Key structure for an address.  */
@@ -1731,15 +1734,8 @@ EXPORT_SYMBOL(tcp_add_backlog);
 int tcp_filter(struct sock *sk, struct sk_buff *skb)
 {
         struct tcphdr *th = (struct tcphdr *)skb->data;
-        unsigned int eaten = skb->len;
-        int err;
 
-        err = sk_filter_trim_cap(sk, skb, th->doff * 4);
-        if (!err) {
-                eaten -= skb->len;
-                TCP_SKB_CB(skb)->end_seq -= eaten;
-        }
-        return err;
+        return sk_filter_trim_cap(sk, skb, th->doff * 4);
 }
 EXPORT_SYMBOL(tcp_filter);
 
@@ -2437,7 +2433,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)
                 refcount_read(&sk->sk_refcnt), sk,
                 jiffies_to_clock_t(icsk->icsk_rto),
                 jiffies_to_clock_t(icsk->icsk_ack.ato),
-                (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
+                (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sk),
                 tp->snd_cwnd,
                 state == TCP_LISTEN ?
                     fastopenq->max_qlen :