diff options
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | virtio_pci-fix-out-of-bound-access-for-msix_names.patch | 56 |
4 files changed, 6 insertions, 62 deletions
@@ -1 +1 @@ -ad0376eb1483bd9880770b346f6592aece669e4c +fe82203b63e598c34d96e846dea49679a726fc7a diff --git a/kernel.spec b/kernel.spec index b17d27933..8b0ef5aae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -602,9 +602,6 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch -# Fix virtio devices rhbz 1430297 -Patch669: virtio_pci-fix-out-of-bound-access-for-msix_names.patch - #CVE-2017-7261 rhbz 1435719 1435740 Patch670: vmwgfx-check-that-number-of-mip-levels-is-above-zero.patch @@ -2172,6 +2169,9 @@ fi # # %changelog +* Wed Mar 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc4.git2.1 +- Linux v4.11-rc4-40-gfe82203 + * Tue Mar 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc4.git1.1 - Linux v4.11-rc4-18-gad0376e @@ -1,4 +1,4 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (patch-4.11-rc4.xz) = d92866ffe4997a5e489c034fc1c378d7e588f76cfa18d642854ce0bf412cdbc82d8e850d6665fa5175084ec0b7662b0f53435231d2b46b13cefbb9ba63f73791 -SHA512 (patch-4.11-rc4-git1.xz) = 734f0d07977641fd9d41946d2800d98c6e0363df500d8b75c00ebf6dd35ca19392bfdf8655ed6488bad1a94fe29c532f9f44233c8ec5d54e9fc50faa83c924b7 +SHA512 (patch-4.11-rc4-git2.xz) = 74ca2f5554088825e1d861a9d66b463f3828265ac2c5e94a6f27fd2175c70fd03bff93ddd929afecdfdcce870b637a808466a4a61707112a451ab256e6ed24a7 diff --git a/virtio_pci-fix-out-of-bound-access-for-msix_names.patch b/virtio_pci-fix-out-of-bound-access-for-msix_names.patch deleted file mode 100644 index d87676674..000000000 --- a/virtio_pci-fix-out-of-bound-access-for-msix_names.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Jason Wang <jasowang@redhat.com> -Date: Thu, 23 Mar 2017 13:07:16 +0800 -Subject: [PATCH] virtio_pci: fix out of bound access for msix_names - ---- - drivers/virtio/virtio_pci_common.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c -index df548a6..5905349 100644 ---- a/drivers/virtio/virtio_pci_common.c -+++ b/drivers/virtio/virtio_pci_common.c -@@ -147,7 +147,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - { - struct virtio_pci_device *vp_dev = to_vp_device(vdev); - const char *name = dev_name(&vp_dev->vdev.dev); -- int i, err = -ENOMEM, allocated_vectors, nvectors; -+ int i, j, err = -ENOMEM, allocated_vectors, nvectors; - unsigned flags = PCI_IRQ_MSIX; - bool shared = false; - u16 msix_vec; -@@ -212,7 +212,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - if (!vp_dev->msix_vector_map) - goto out_disable_config_irq; - -- allocated_vectors = 1; /* vector 0 is the config interrupt */ -+ allocated_vectors = j = 1; /* vector 0 is the config interrupt */ - for (i = 0; i < nvqs; ++i) { - if (!names[i]) { - vqs[i] = NULL; -@@ -236,18 +236,19 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - continue; - } - -- snprintf(vp_dev->msix_names[i + 1], -+ snprintf(vp_dev->msix_names[j], - sizeof(*vp_dev->msix_names), "%s-%s", - dev_name(&vp_dev->vdev.dev), names[i]); - err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec), - vring_interrupt, IRQF_SHARED, -- vp_dev->msix_names[i + 1], vqs[i]); -+ vp_dev->msix_names[j], vqs[i]); - if (err) { - /* don't free this irq on error */ - vp_dev->msix_vector_map[i] = VIRTIO_MSI_NO_VECTOR; - goto out_remove_vqs; - } - vp_dev->msix_vector_map[i] = msix_vec; -+ j++; - - /* - * Use a different vector for each queue if they are available, --- -2.7.4 - - |