diff options
| author | Tony Lu <tonylu@linux.alibaba.com> | 2021-12-01 14:42:16 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-08 08:50:14 +0100 |
| commit | 40fdfacb2b36c341d91eb6d33588d2e828451f1c (patch) | |
| tree | 24daa678c42196113970f71ee6d1a3dab09f5698 /net/smc | |
| parent | 11560e97716c261e29f04ea1190aaa44456d8754 (diff) | |
| download | linux-stable-40fdfacb2b36c341d91eb6d33588d2e828451f1c.tar.gz linux-stable-40fdfacb2b36c341d91eb6d33588d2e828451f1c.tar.bz2 linux-stable-40fdfacb2b36c341d91eb6d33588d2e828451f1c.zip | |
net/smc: Keep smc_close_final rc during active close
commit 00e158fb91dfaff3f94746f260d11f1a4853506e upstream.
When smc_close_final() returns error, the return code overwrites by
kernel_sock_shutdown() in smc_close_active(). The return code of
smc_close_final() is more important than kernel_sock_shutdown(), and it
will pass to userspace directly.
Fix it by keeping both return codes, if smc_close_final() raises an
error, return it or kernel_sock_shutdown()'s.
Link: https://lore.kernel.org/linux-s390/1f67548e-cbf6-0dce-82b5-10288a4583bd@linux.ibm.com/
Fixes: 606a63c9783a ("net/smc: Ensure the active closing peer first closes clcsock")
Suggested-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Reviewed-by: Wen Gu <guwen@linux.alibaba.com>
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_close.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c index e25c023582f9..092696d738c0 100644 --- a/net/smc/smc_close.c +++ b/net/smc/smc_close.c @@ -167,6 +167,7 @@ int smc_close_active(struct smc_sock *smc) int old_state; long timeout; int rc = 0; + int rc1 = 0; timeout = current->flags & PF_EXITING ? 0 : sock_flag(sk, SOCK_LINGER) ? @@ -206,8 +207,11 @@ again: /* actively shutdown clcsock before peer close it, * prevent peer from entering TIME_WAIT state. */ - if (smc->clcsock && smc->clcsock->sk) - rc = kernel_sock_shutdown(smc->clcsock, SHUT_RDWR); + if (smc->clcsock && smc->clcsock->sk) { + rc1 = kernel_sock_shutdown(smc->clcsock, + SHUT_RDWR); + rc = rc ? rc : rc1; + } } else { /* peer event has changed the state */ goto again; |