diff options
| author | Ursula Braun <ubraun@linux.ibm.com> | 2018-08-08 14:13:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-08 19:14:22 -0700 |
| commit | 7311d665ca68907b9c43d6d1021f816f9a7bbd57 (patch) | |
| tree | 3edc813b7168552a1ca9afad1f04b698a65f371e /net/smc | |
| parent | bd58c7e0860f54710907903ed6daff699d1fc5b9 (diff) | |
| download | lwn-7311d665ca68907b9c43d6d1021f816f9a7bbd57.tar.gz lwn-7311d665ca68907b9c43d6d1021f816f9a7bbd57.zip | |
net/smc: move sock lock in smc_ioctl()
When an SMC socket is connecting it is decided whether fallback to
TCP is needed. To avoid races between connect and ioctl move the
sock lock before the use_fallback check.
Reported-by: syzbot+5b2cece1a8ecb2ca77d8@syzkaller.appspotmail.com
Reported-by: syzbot+19557374321ca3710990@syzkaller.appspotmail.com
Fixes: 1992d99882af ("net/smc: take sock lock in smc_ioctl()")
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/af_smc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 0ee7721afbe5..e7de5f282722 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1522,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); + } + answ = smc->clcsock->ops->ioctl(smc->clcsock, cmd, arg); + release_sock(&smc->sk); + return answ; } - lock_sock(&smc->sk); switch (cmd) { case SIOCINQ: /* same as FIONREAD */ if (smc->sk.sk_state == SMC_LISTEN) { |