lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 17 Mar 2010 11:40:23 -0700 From: Laurent Chavey <chavey@...gle.com> To: "Michael S. Tsirkin" <mst@...hat.com> Cc: Jiri Slaby <jirislaby@...il.com>, kvm@...r.kernel.org, virtualization@...ts.osdl.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: [PATCH] vhost: fix error handling in vring ioctls Acked-by: Laurent Chavey <chavey@...gle.com> On Wed, Mar 17, 2010 at 10:54 AM, Laurent Chavey <chavey@...gle.com> wrote: > Acked-by: chavey@...gle.com > > > On Wed, Mar 17, 2010 at 7:42 AM, Michael S. Tsirkin <mst@...hat.com> wrote: >> Stanse found a locking problem in vhost_set_vring: >> several returns from VHOST_SET_VRING_KICK, VHOST_SET_VRING_CALL, >> VHOST_SET_VRING_ERR with the vq->mutex held. >> Fix these up. >> >> Reported-by: Jiri Slaby <jirislaby@...il.com> >> Signed-off-by: Michael S. Tsirkin <mst@...hat.com> >> --- >> drivers/vhost/vhost.c | 18 ++++++++++++------ >> 1 files changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c >> index 7cd55e0..7bd7a1e 100644 >> --- a/drivers/vhost/vhost.c >> +++ b/drivers/vhost/vhost.c >> @@ -476,8 +476,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) >> if (r < 0) >> break; >> eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd); >> - if (IS_ERR(eventfp)) >> - return PTR_ERR(eventfp); >> + if (IS_ERR(eventfp)) { >> + r = PTR_ERR(eventfp); >> + break; >> + } >> if (eventfp != vq->kick) { >> pollstop = filep = vq->kick; >> pollstart = vq->kick = eventfp; >> @@ -489,8 +491,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) >> if (r < 0) >> break; >> eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd); >> - if (IS_ERR(eventfp)) >> - return PTR_ERR(eventfp); >> + if (IS_ERR(eventfp)) { >> + r = PTR_ERR(eventfp); >> + break; >> + } >> if (eventfp != vq->call) { >> filep = vq->call; >> ctx = vq->call_ctx; >> @@ -505,8 +509,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) >> if (r < 0) >> break; >> eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd); >> - if (IS_ERR(eventfp)) >> - return PTR_ERR(eventfp); >> + if (IS_ERR(eventfp)) { >> + r = PTR_ERR(eventfp); >> + break; >> + } >> if (eventfp != vq->error) { >> filep = vq->error; >> vq->error = eventfp; >> -- >> 1.7.0.18.g0d53a5 >> -- >> To unsubscribe from this list: send the line "unsubscribe netdev" in >> the body of a message to majordomo@...r.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists