diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
| commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
| tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /net/tls/tls_sw.c | |
| parent | Merge tag 'perf-core-for-mingo-4.19-20180725' of git://git.kernel.org/pub/scm... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo-4.18-20180730' of git://git.kernel.org/pub/s... (diff) | |
| download | linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.xz linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tls/tls_sw.c')
| -rw-r--r-- | net/tls/tls_sw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 4618f1c31137..1f3d9789af30 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -646,6 +646,9 @@ static struct sk_buff *tls_wait_data(struct sock *sk, int flags, return NULL; } + if (sk->sk_shutdown & RCV_SHUTDOWN) + return NULL; + if (sock_flag(sk, SOCK_DONE)) return NULL; |