提交 7311d665 编写于 作者: U Ursula Braun 提交者: David S. Miller

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: 1992d998 ("net/smc: take sock lock in smc_ioctl()")
Signed-off-by: NUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 bd58c7e0
...@@ -1522,12 +1522,16 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd, ...@@ -1522,12 +1522,16 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
smc = smc_sk(sock->sk); smc = smc_sk(sock->sk);
conn = &smc->conn; conn = &smc->conn;
lock_sock(&smc->sk);
if (smc->use_fallback) { if (smc->use_fallback) {
if (!smc->clcsock) if (!smc->clcsock) {
release_sock(&smc->sk);
return -EBADF; 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) { switch (cmd) {
case SIOCINQ: /* same as FIONREAD */ case SIOCINQ: /* same as FIONREAD */
if (smc->sk.sk_state == SMC_LISTEN) { if (smc->sk.sk_state == SMC_LISTEN) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册