diff options
| author |   Jason Wang <jasowang@redhat.com> | 2018-03-27 20:50:52 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-27 13:03:18 -0400 |
| commit | dc6455a71c7fc5117977e197f67f71b49f27baba (patch) | |
| tree | 524dca0c836ebcc1f9d2f4e5fbcfd882955a0f6b /drivers/vhost/vhost.c | |
| parent | Merge branch 'mlx4-misc-fixes-for-4.16' (diff) | |
| download | linux-dev-dc6455a71c7fc5117977e197f67f71b49f27baba.tar.xz linux-dev-dc6455a71c7fc5117977e197f67f71b49f27baba.zip | |
vhost: correctly remove wait queue during poll failure
We tried to remove vq poll from wait queue, but do not check whether
or not it was in a list before. This will lead double free. Fixing
this by switching to use vhost_poll_stop() which zeros poll->wqh after
removing poll from waitqueue to make sure it won't be freed twice.
Cc: Darren Kenny <darren.kenny@oracle.com>
Reported-by: syzbot+c0272972b01b872e604a@syzkaller.appspotmail.com
Fixes: 2b8b328b61c79 ("vhost_net: handle polling errors when setting backend")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/vhost.c')
| -rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 1b3e8d2d5c8b..5d5a9d9e66d3 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -212,8 +212,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file) if (mask) vhost_poll_wakeup(&poll->wait, 0, 0, poll_to_key(mask)); if (mask & EPOLLERR) { - if (poll->wqh) - remove_wait_queue(poll->wqh, &poll->wait); + vhost_poll_stop(poll); ret = -EINVAL; } |