From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri, 17 Jul 2015 13:32:03 +0000 (+0200)
Subject: vhost: actually track log eventfd file
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7932c0bd7740f4cd2aa168d3ce0199e7af7d72d5;p=openwrt%2Fstaging%2Fblogic.git

vhost: actually track log eventfd file

While reviewing vhost log code, I found out that log_file is never
set. Note: I haven't tested the change (QEMU doesn't use LOG_FD yet).

Cc: stable@vger.kernel.org
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index a9fe859f43c8..95bdb90fd7f0 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -995,6 +995,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
 		}
 		if (eventfp != d->log_file) {
 			filep = d->log_file;
+			d->log_file = eventfp;
 			ctx = d->log_ctx;
 			d->log_ctx = eventfp ?
 				eventfd_ctx_fileget(eventfp) : NULL;