[linux] 02/02: virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156)

[debian-kernel at lists.debian.org]

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

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

commit f73e15caf6cf5f56d134a1eb16e822abe0c08764
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Sep 9 21:05:10 2015 +0100

    virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156)
---
 debian/changelog                                   |  1 +
 .../all/virtio-net-drop-netif_f_fraglist.patch     | 36 ++++++++++++++++++++++
 debian/patches/series/48squeeze14                  |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5225d9d..e26f6ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux-2.6 (2.6.32-48squeeze14) UNRELEASED; urgency=medium
     - debian/control: Update Vcs-* fields
     - README.Debian, README.source: Update references to svn
   * ipv6: addrconf: validate new MTU before applying it (CVE-2015-0272)
+  * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Jun 2015 23:23:19 +0100
 
diff --git a/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch b/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch
new file mode 100644
index 0000000..e061938
--- /dev/null
+++ b/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch
@@ -0,0 +1,36 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 5 Aug 2015 10:34:04 +0800
+Subject: virtio-net: drop NETIF_F_FRAGLIST
+Origin: https://git.kernel.org/linus/48900cb6af4282fa0fb6ff4d72a81aa3dadb5c39
+
+virtio declares support for NETIF_F_FRAGLIST, but assumes
+that there are at most MAX_SKB_FRAGS + 2 fragments which isn't
+always true with a fraglist.
+
+A longer fraglist in the skb will make the call to skb_to_sgvec overflow
+the sg array, leading to memory corruption.
+
+Drop NETIF_F_FRAGLIST so we only get what we can handle.
+
+Cc: Michael S. Tsirkin <mst at redhat.com>
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Acked-by: Michael S. Tsirkin <mst at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+[bwh: Backported to 2.6.32: there's only a single features field]
+---
+ drivers/net/virtio_net.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
+index 7fbca37..237f8e5 100644
+--- a/drivers/net/virtio_net.c
++++ b/drivers/net/virtio_net.c
+@@ -868,7 +868,7 @@ static int virtnet_probe(struct virtio_device *vdev)
+ 	/* Do we support "hardware" checksums? */
+ 	if (csum && virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
+ 		/* This opens up the world of extra features. */
+-		dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
++		dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+ 		if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
+ 			dev->features |= NETIF_F_TSO | NETIF_F_UFO
+ 				| NETIF_F_TSO_ECN | NETIF_F_TSO6;
diff --git a/debian/patches/series/48squeeze14 b/debian/patches/series/48squeeze14
index 2ba4b84..eaf693b 100644
--- a/debian/patches/series/48squeeze14
+++ b/debian/patches/series/48squeeze14
@@ -3,3 +3,4 @@
 + bugfix/all/crypto-testmgr-update-lzo-compression-test-vectors.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

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