diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
| commit | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (patch) | |
| tree | 4cab2d6b92324c06a457c43a5c8bac55581cdfb5 /net/ipv4/tcp.c | |
| parent | cd1fe2006b62234455a91e428bad45331dc79250 (diff) | |
| parent | 701115b70ba8e8b20c6cfe689db4c1dd6af3ece9 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5597120c8ffd..37e8966a457b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2176,6 +2176,9 @@ adjudge_to_death: tcp_send_active_reset(sk, GFP_ATOMIC); NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPABORTONMEMORY); + } else if (!check_net(sock_net(sk))) { + /* Not possible to send reset; just close */ + tcp_set_state(sk, TCP_CLOSE); } } |