diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-16 09:18:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-16 09:18:46 +0100 |
| commit | 93c69b2d17372463ae33b79b3002c22a208945b3 (patch) | |
| tree | 328d30d717710d830633337ada90a65d65095eda /net/iucv/af_iucv.c | |
| parent | ef84928cff589c6b42e16b3ef7d2d95469128c80 (diff) | |
| parent | 09162bc32c880a791c6c0668ce0745cf7958f576 (diff) | |
| download | lwn-93c69b2d17372463ae33b79b3002c22a208945b3.tar.gz lwn-93c69b2d17372463ae33b79b3002c22a208945b3.zip | |
Merge 5.10-rc4 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/iucv/af_iucv.c')
| -rw-r--r-- | net/iucv/af_iucv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index d80572074667..047238f01ba6 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1434,7 +1434,8 @@ static int iucv_sock_shutdown(struct socket *sock, int how) break; } - if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) { + if ((how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) && + sk->sk_state == IUCV_CONNECTED) { if (iucv->transport == AF_IUCV_TRANS_IUCV) { txmsg.class = 0; txmsg.tag = 0; |