diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-03-27 13:31:06 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-03-27 13:31:06 +0200 |
| commit | ae25669e4fa804667db38c044ce9b3f34da94250 (patch) | |
| tree | 43bf2a379118f8266dffd3c0c266f89c58086838 /net/ipv4/tcp_ipv4.c | |
| parent | da84368695d6d20543e2a66203aded81ff31756d (diff) | |
| parent | 2a486264b736de1c1d938c9c781efbadbf9fd794 (diff) | |
| download | linux-rt-ae25669e4fa804667db38c044ce9b3f34da94250.tar.gz | |
Merge tag 'v4.9.18' into linux-4.9.y-rt
This is the 4.9.18 stable release
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 829e60985a81..672fffcde28c 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -270,10 +270,13 @@ EXPORT_SYMBOL(tcp_v4_connect); */ void tcp_v4_mtu_reduced(struct sock *sk) { - struct dst_entry *dst; struct inet_sock *inet = inet_sk(sk); - u32 mtu = tcp_sk(sk)->mtu_info; + struct dst_entry *dst; + u32 mtu; + if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) + return; + mtu = tcp_sk(sk)->mtu_info; dst = inet_csk_update_pmtu(sk, mtu); if (!dst) return; @@ -419,7 +422,8 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) switch (type) { case ICMP_REDIRECT: - do_redirect(icmp_skb, sk); + if (!sock_owned_by_user(sk)) + do_redirect(icmp_skb, sk); goto out; case ICMP_SOURCE_QUENCH: /* Just silently ignore these. */ |