From: Greg Kroah-Hartman Date: Mon, 8 Nov 2021 07:05:04 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.292~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e20afc32be9225a49bbf200babd930dc50ff5342;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: revert-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch --- diff --git a/queue-4.14/revert-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch b/queue-4.14/revert-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch new file mode 100644 index 00000000000..2b045209b45 --- /dev/null +++ b/queue-4.14/revert-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch @@ -0,0 +1,55 @@ +From 1e254d0d86a0f2efd4190a89d5204b37c18c6381 Mon Sep 17 00:00:00 2001 +From: Juergen Gross +Date: Mon, 13 Sep 2021 15:57:43 +0200 +Subject: Revert "x86/kvm: fix vcpu-id indexed array sizes" + +From: Juergen Gross + +commit 1e254d0d86a0f2efd4190a89d5204b37c18c6381 upstream. + +This reverts commit 76b4f357d0e7d8f6f0013c733e6cba1773c266d3. + +The commit has the wrong reasoning, as KVM_MAX_VCPU_ID is not defining the +maximum allowed vcpu-id as its name suggests, but the number of vcpu-ids. +So revert this patch again. + +Suggested-by: Eduardo Habkost +Signed-off-by: Juergen Gross +Signed-off-by: Paolo Bonzini +Message-Id: <20210913135745.13944-2-jgross@suse.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/ioapic.c | 2 +- + arch/x86/kvm/ioapic.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/x86/kvm/ioapic.c ++++ b/arch/x86/kvm/ioapic.c +@@ -96,7 +96,7 @@ static unsigned long ioapic_read_indirec + static void rtc_irq_eoi_tracking_reset(struct kvm_ioapic *ioapic) + { + ioapic->rtc_status.pending_eoi = 0; +- bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID + 1); ++ bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID); + } + + static void kvm_rtc_eoi_tracking_restore_all(struct kvm_ioapic *ioapic); +--- a/arch/x86/kvm/ioapic.h ++++ b/arch/x86/kvm/ioapic.h +@@ -43,13 +43,13 @@ struct kvm_vcpu; + + struct dest_map { + /* vcpu bitmap where IRQ has been sent */ +- DECLARE_BITMAP(map, KVM_MAX_VCPU_ID + 1); ++ DECLARE_BITMAP(map, KVM_MAX_VCPU_ID); + + /* + * Vector sent to a given vcpu, only valid when + * the vcpu's bit in map is set + */ +- u8 vectors[KVM_MAX_VCPU_ID + 1]; ++ u8 vectors[KVM_MAX_VCPU_ID]; + }; + + diff --git a/queue-4.14/series b/queue-4.14/series index 24cd4dad086..b1cb3d1dd2c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -6,3 +6,4 @@ arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch ib-qib-use-struct_size-helper.patch ib-qib-protect-from-buffer-overflow-in-struct-qib_user_sdma_pkt-fields.patch block-introduce-multi-page-bvec-helpers.patch +revert-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch