Commit 1255fcb2 authored Apr 19, 2018 by Ursula Braun Committed by David S. Miller Apr 19, 2018

net/smc: fix shutdown in state SMC_LISTEN



Calling shutdown with SHUT_RD and SHUT_RDWR for a listening SMC socket
crashes, because
   commit 127f4970 ("net/smc: release clcsock from tcp_listen_worker")
releases the internal clcsock in smc_close_active() and sets smc->clcsock
to NULL.
For SHUT_RD the smc_close_active() call is removed.
For SHUT_RDWR the kernel_sock_shutdown() call is omitted, since the
clcsock is already released.

Fixes: 127f4970 ("net/smc: release clcsock from tcp_listen_worker")
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a60faa60

net/smc/af_smc.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1259,13 +1259,11 @@ static int smc_shutdown(struct socket *sock, int how)
		rc = smc_close_shutdown_write(smc);
		break;
		case SHUT_RD:
		if (sk->sk_state == SMC_LISTEN)
		rc = smc_close_active(smc);
		else
		rc = 0;
		/* nothing more to do because peer is not involved */
		break;
		}
		if (smc->clcsock)
		rc1 = kernel_sock_shutdown(smc->clcsock, how);
		/* map sock_shutdown_cmd constants to sk_shutdown value range */
		sk->sk_shutdown \|= how + 1;

Admin message