Commit ef91b6f9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-fixes' 



Ursula Braun says:

====================
net/smc: fixes 2018-08-08

here are small fixes for SMC: The first patch makes sure, shutdown code
is not executed for sockets in state SMC_LISTEN. The second patch resets
send and receive buffer values for accepted sockets, since TCP buffer size
optimizations for the internal CLC socket should not be forwarded to the
outer SMC socket. The third patch solves a race between connect and ioctl
reported by syzbot.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11ba961c 7311d665

net/smc/af_smc.c

+10 −5
Original line number Diff line number Diff line
@@ -1122,6 +1122,8 @@ static void smc_tcp_listen_work(struct work_struct *work) 
		sock_hold(lsk); /* sock_put in smc_listen_work */

		INIT_WORK(&new_smc->smc_listen_work, smc_listen_work);

		smc_copy_sock_settings_to_smc(new_smc);

		new_smc->sk.sk_sndbuf = lsmc->sk.sk_sndbuf;

		new_smc->sk.sk_rcvbuf = lsmc->sk.sk_rcvbuf;

		sock_hold(&new_smc->sk); /* sock_put in passive closing */

		if (!schedule_work(&new_smc->smc_listen_work))

			sock_put(&new_smc->sk);
@@ -1397,8 +1399,7 @@ static int smc_shutdown(struct socket *sock, int how) 
	lock_sock(sk);



	rc = -ENOTCONN;

	if ((sk->sk_state != SMC_LISTEN) &&

	    (sk->sk_state != SMC_ACTIVE) &&

	if ((sk->sk_state != SMC_ACTIVE) &&

	    (sk->sk_state != SMC_PEERCLOSEWAIT1) &&

	    (sk->sk_state != SMC_PEERCLOSEWAIT2) &&

	    (sk->sk_state != SMC_APPCLOSEWAIT1) &&
@@ -1521,12 +1522,16 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd, 


	smc = smc_sk(sock->sk);

	conn = &smc->conn;

	lock_sock(&smc->sk);

	if (smc->use_fallback) {

		if (!smc->clcsock)

		if (!smc->clcsock) {

			release_sock(&smc->sk);

			return -EBADF;

		return smc->clcsock->ops->ioctl(smc->clcsock, cmd, arg);

		}

	lock_sock(&smc->sk);

		answ = smc->clcsock->ops->ioctl(smc->clcsock, cmd, arg);

		release_sock(&smc->sk);

		return answ;

	}

	switch (cmd) {

	case SIOCINQ: /* same as FIONREAD */

		if (smc->sk.sk_state == SMC_LISTEN) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE