nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

smc: convert to ->poll_mask

Browse source 
smc->clcsock is an internal TCP socket, after TCP socket
converts to ->poll_mask, ->poll doesn't exist any more.
So just convert smc socket to ->poll_mask too.

Fixes: 2c7d3daceb ("net/tcp: convert to ->poll_mask")
Reported-by: syzbot+f5066e369b2d5fff630f@syzkaller.appspotmail.com
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cong Wang 2018-06-11 14:07:14 -07:00 committed by David S. Miller
parent 760a6ed6b6
commit c0129a0614
1 changed files with 3 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
net/smc/af_smc.c
View file

@ -1273,8 +1273,7 @@ static __poll_t smc_accept_poll(struct sock *parent)
return mask; return mask;
} }
static __poll_t smc_poll(struct file *file, struct socket *sock, static __poll_t smc_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
__poll_t mask = 0; __poll_t mask = 0;
@ -1290,7 +1289,7 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
if ((sk->sk_state == SMC_INIT) || smc->use_fallback) { if ((sk->sk_state == SMC_INIT) || smc->use_fallback) {
/* delegate to CLC child sock */ /* delegate to CLC child sock */
release_sock(sk); release_sock(sk);
mask = smc->clcsock->ops->poll(file, smc->clcsock, wait); mask = smc->clcsock->ops->poll_mask(smc->clcsock, events);
lock_sock(sk); lock_sock(sk);
sk->sk_err = smc->clcsock->sk->sk_err; sk->sk_err = smc->clcsock->sk->sk_err;
if (sk->sk_err) { if (sk->sk_err) {
@ -1308,11 +1307,6 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
} }
} }
} else { } else {
if (sk->sk_state != SMC_CLOSED) {
release_sock(sk);
sock_poll_wait(file, sk_sleep(sk), wait);
lock_sock(sk);
}
if (sk->sk_err) if (sk->sk_err)
mask |= EPOLLERR; mask |= EPOLLERR;
if ((sk->sk_shutdown == SHUTDOWN_MASK) || if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
@ -1625,7 +1619,7 @@ static const struct proto_ops smc_sock_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = smc_accept, .accept = smc_accept,
.getname = smc_getname, .getname = smc_getname,
.poll = smc_poll, .poll_mask = smc_poll_mask,
.ioctl = smc_ioctl, .ioctl = smc_ioctl,
.listen = smc_listen, .listen = smc_listen,
.shutdown = smc_shutdown, .shutdown = smc_shutdown,