[linux] 01/01: vhost: actually track log eventfd file (CVE-2015-6252)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit 1805ceabf5042ce2978825e7e7c3435289794131
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Sep 9 21:26:02 2015 +0100

    vhost: actually track log eventfd file (CVE-2015-6252)
---
 debian/changelog                                   |  1 +
 .../vhost-actually-track-log-eventfd-file.patch    | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6ed94a9..512b819 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (3.2.68-1+deb7u4) UNRELEASED; urgency=medium
 
   * ipv6: addrconf: validate new MTU before applying it (CVE-2015-0272)
   * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156)
+  * vhost: actually track log eventfd file (CVE-2015-6252)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 07 Aug 2015 19:47:24 +0100
 
diff --git a/debian/patches/bugfix/all/vhost-actually-track-log-eventfd-file.patch b/debian/patches/bugfix/all/vhost-actually-track-log-eventfd-file.patch
new file mode 100644
index 0000000..8e27e22
--- /dev/null
+++ b/debian/patches/bugfix/all/vhost-actually-track-log-eventfd-file.patch
@@ -0,0 +1,30 @@
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at redhat.com>
+Date: Fri, 17 Jul 2015 15:32:03 +0200
+Subject: vhost: actually track log eventfd file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://git.kernel.org/linus/7932c0bd7740f4cd2aa168d3ce0199e7af7d72d5
+
+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 at vger.kernel.org
+Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/vhost/vhost.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
+index a9fe859..95bdb90 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;
diff --git a/debian/patches/series b/debian/patches/series
index b32effc..0d0ef8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1177,3 +1177,4 @@ bugfix/all/sg_start_req-make-sure-that-there-s-not-too-many-ele.patch
 bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch
 bugfix/all/ipv6-addrconf-validate-new-MTU-before-applying-it.patch
 bugfix/all/virtio-net-drop-netif_f_fraglist.patch
+bugfix/all/vhost-actually-track-log-eventfd-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git