rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CVE-2015-5156 virtio-net: bug overflow with large fraglist (rhbz 1243852 1266515)

This commit is contained in:
Josh Boyer 2015-10-07 09:42:22 -04:00
parent 3650f14166
commit 93abfceba3
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.spec
View File

@ -677,6 +677,9 @@ Patch537: si2157-Bounds-check-firmware.patch
#rhbz 1268037
Patch538: ALSA-hda-Add-dock-support-for-ThinkPad-T550.patch
#CVE-2015-5156 rhbz 1243852 1266515
Patch539: virtio-net-drop-NETIF_F_FRAGLIST.patch
# END OF PATCH DEFINITIONS
%endif
@ -1460,6 +1463,9 @@ ApplyPatch si2157-Bounds-check-firmware.patch
#rhbz 1268037
ApplyPatch ALSA-hda-Add-dock-support-for-ThinkPad-T550.patch
#CVE-2015-5156 rhbz 1243852 1266515
ApplyPatch virtio-net-drop-NETIF_F_FRAGLIST.patch
# END OF PATCH APPLICATIONS
%endif
@ -2319,6 +2325,9 @@ fi
# ||----w |
# || ||
%changelog
* Wed Oct 07 2015 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2015-5156 virtio-net: bug overflow with large fraglist (rhbz 1243852 1266515)
* Mon Oct 05 2015 Laura Abbott <labbott@fedoraproject.org>
- Make headphone work with with T550 + Dock (rhbz 1268037)

41
virtio-net-drop-NETIF_F_FRAGLIST.patch Normal file
View File

@ -0,0 +1,41 @@
From 039bee8e4ee644720e8c234562c9228c1179bb1c Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 5 Aug 2015 10:34:04 +0800
Subject: [PATCH] virtio-net: drop NETIF_F_FRAGLIST
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@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
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 7fbca37a1adf..237f8e5e493d 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev)
/* Do we support "hardware" checksums? */
if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
/* This opens up the world of extra features. */
- dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
+ dev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_SG;
if (csum)
- dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
+ dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
--
2.4.3