diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-04-28 17:12:08 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-05-01 10:02:54 +0300 |
| commit | 150b9e51ae975ca1fe468c565870fbc4a96e0574 (patch) | |
| tree | c708d0c69807c7ac4eb14e86498536c5ec1c6c82 /drivers/vhost/net.c | |
| parent | 061b16cfe3dc7a106dd29b76f6355d84464d126c (diff) | |
| download | linux-150b9e51ae975ca1fe468c565870fbc4a96e0574.tar.gz linux-150b9e51ae975ca1fe468c565870fbc4a96e0574.tar.bz2 linux-150b9e51ae975ca1fe468c565870fbc4a96e0574.zip | |
vhost: fix error handling in RESET_OWNER ioctl
RESET_OWNER ioctl would leave the fd in a bad state if
memory allocation failed: device is stopped
but owner is not reset. Make state changes
after allocating memory, such that a failed
ioctl has no effect.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index e34e195b9cf6..a3645bd163d8 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -967,14 +967,20 @@ static long vhost_net_reset_owner(struct vhost_net *n) struct socket *tx_sock = NULL; struct socket *rx_sock = NULL; long err; + struct vhost_memory *memory; mutex_lock(&n->dev.mutex); err = vhost_dev_check_owner(&n->dev); if (err) goto done; + memory = vhost_dev_reset_owner_prepare(); + if (!memory) { + err = -ENOMEM; + goto done; + } vhost_net_stop(n, &tx_sock, &rx_sock); vhost_net_flush(n); - err = vhost_dev_reset_owner(&n->dev); + vhost_dev_reset_owner(&n->dev, memory); vhost_net_vq_reset(n); done: mutex_unlock(&n->dev.mutex); |