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

Add queued 4.1 net stable fixes

This commit is contained in:
Josh Boyer 2015-11-16 08:45:03 -05:00
parent c1cfdfef5d
commit 67e2c2bc5e
3 changed files with 1434 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel.spec
View File

@ -653,9 +653,6 @@ Patch523: RDS-verify-the-underlying-transport-exists-before-cr.patch
#CVE-2015-7990 rhbz 1276437 1276438
Patch524: RDS-fix-race-condition-when-sending-a-message-on-unb.patch
#CVE-2015-5156 rhbz 1243852 1266515
Patch539: virtio-net-drop-NETIF_F_FRAGLIST.patch
#rhbz 1272172
Patch540: 0001-KEYS-Fix-crash-when-attempt-to-garbage-collect-an-un.patch
Patch541: 0002-KEYS-Don-t-permit-request_key-to-construct-a-new-key.patch
@ -673,6 +670,8 @@ Patch551: KVM-svm-unconditionally-intercept-DB.patch
#rhbz 1275490
Patch553: ideapad-laptop-Add-Lenovo-Yoga-900-to-no_hw_rfkill-d.patch
Patch555: net_41.mbox
# END OF PATCH DEFINITIONS
%endif
@ -1433,9 +1432,6 @@ ApplyPatch RDS-verify-the-underlying-transport-exists-before-cr.patch
#CVE-2015-7990 rhbz 1276437 1276438
ApplyPatch RDS-fix-race-condition-when-sending-a-message-on-unb.patch
#CVE-2015-5156 rhbz 1243852 1266515
ApplyPatch virtio-net-drop-NETIF_F_FRAGLIST.patch
#rhbz 1272172
ApplyPatch 0001-KEYS-Fix-crash-when-attempt-to-garbage-collect-an-un.patch
ApplyPatch 0002-KEYS-Don-t-permit-request_key-to-construct-a-new-key.patch
@ -1453,6 +1449,8 @@ ApplyPatch KVM-svm-unconditionally-intercept-DB.patch
#rhbz 1275490
ApplyPatch ideapad-laptop-Add-Lenovo-Yoga-900-to-no_hw_rfkill-d.patch
ApplyPatch net_41.mbox
# END OF PATCH APPLICATIONS
%endif
@ -2312,6 +2310,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon Nov 16 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Add queued 4.1 net stable fixes
* Tue Nov 10 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Fix Yoga 900 rfkill switch issues (rhbz 1275490)

1427
net_41.mbox Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1,41 +0,0 @@
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