From: Greg Kroah-Hartman Date: Thu, 26 May 2022 12:16:21 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.18.1~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=858c87f7a6cb2b04957c644c9bd5a4b3421e4d75;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: ice-fix-crash-at-allocation-failure.patch kvm-x86-mmu-fix-null-pointer-dereference-on-guest-invpcid.patch --- diff --git a/queue-5.15/ice-fix-crash-at-allocation-failure.patch b/queue-5.15/ice-fix-crash-at-allocation-failure.patch new file mode 100644 index 00000000000..76c3ae68118 --- /dev/null +++ b/queue-5.15/ice-fix-crash-at-allocation-failure.patch @@ -0,0 +1,39 @@ +From magnus.karlsson@gmail.com Thu May 26 14:13:37 2022 +From: Magnus Karlsson +Date: Wed, 25 May 2022 09:19:53 +0200 +Subject: [PATCH 5.15] ice: fix crash at allocation failure +To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org, maciej.fijalkowski@intel.com, bjorn@kernel.org +Cc: Magnus Karlsson , Jeff Shaw +Message-ID: <20220525071953.27755-1-magnus.karlsson@gmail.com> + + +From: Magnus Karlsson + +Fix a crash in the zero-copy driver that occurs when it fails to +allocate buffers from user-space. This crash can easily be triggered +by a malicious program that does not provide any buffers in the fill +ring for the kernel to use. + +Note that this bug does not exist in upstream since the batched buffer +allocation interface got introduced in 5.16 and replaced this code. + +Reported-by: Jeff Shaw +Tested-by: Jeff Shaw +Signed-off-by: Magnus Karlsson +Acked-by: Maciej Fijalkowski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/ice/ice_xsk.c ++++ b/drivers/net/ethernet/intel/ice/ice_xsk.c +@@ -378,7 +378,7 @@ bool ice_alloc_rx_bufs_zc(struct ice_rin + + do { + *xdp = xsk_buff_alloc(rx_ring->xsk_pool); +- if (!xdp) { ++ if (!*xdp) { + ok = false; + break; + } diff --git a/queue-5.15/kvm-x86-mmu-fix-null-pointer-dereference-on-guest-invpcid.patch b/queue-5.15/kvm-x86-mmu-fix-null-pointer-dereference-on-guest-invpcid.patch new file mode 100644 index 00000000000..3418c849e88 --- /dev/null +++ b/queue-5.15/kvm-x86-mmu-fix-null-pointer-dereference-on-guest-invpcid.patch @@ -0,0 +1,56 @@ +From 9f46c187e2e680ecd9de7983e4d081c3391acc76 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Fri, 20 May 2022 13:48:11 -0400 +Subject: KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID + +From: Paolo Bonzini + +commit 9f46c187e2e680ecd9de7983e4d081c3391acc76 upstream. + +With shadow paging enabled, the INVPCID instruction results in a call +to kvm_mmu_invpcid_gva. If INVPCID is executed with CR0.PG=0, the +invlpg callback is not set and the result is a NULL pointer dereference. +Fix it trivially by checking for mmu->invlpg before every call. + +There are other possibilities: + +- check for CR0.PG, because KVM (like all Intel processors after P5) + flushes guest TLB on CR0.PG changes so that INVPCID/INVLPG are a + nop with paging disabled + +- check for EFER.LMA, because KVM syncs and flushes when switching + MMU contexts outside of 64-bit mode + +All of these are tricky, go for the simple solution. This is CVE-2022-1789. + +Reported-by: Yongkang Jia +Cc: stable@vger.kernel.org +Signed-off-by: Paolo Bonzini +[fix conflict due to missing b9e5603c2a3accbadfec570ac501a54431a6bdba] +Signed-off-by: Vegard Nossum +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/mmu/mmu.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/x86/kvm/mmu/mmu.c ++++ b/arch/x86/kvm/mmu/mmu.c +@@ -5396,14 +5396,16 @@ void kvm_mmu_invpcid_gva(struct kvm_vcpu + uint i; + + if (pcid == kvm_get_active_pcid(vcpu)) { +- mmu->invlpg(vcpu, gva, mmu->root_hpa); ++ if (mmu->invlpg) ++ mmu->invlpg(vcpu, gva, mmu->root_hpa); + tlb_flush = true; + } + + for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) { + if (VALID_PAGE(mmu->prev_roots[i].hpa) && + pcid == kvm_get_pcid(vcpu, mmu->prev_roots[i].pgd)) { +- mmu->invlpg(vcpu, gva, mmu->prev_roots[i].hpa); ++ if (mmu->invlpg) ++ mmu->invlpg(vcpu, gva, mmu->prev_roots[i].hpa); + tlb_flush = true; + } + } diff --git a/queue-5.15/series b/queue-5.15/series index eece0fd2d5d..496ac4fbb97 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1 +1,3 @@ hid-amd_sfh-add-support-for-sensor-discovery.patch +kvm-x86-mmu-fix-null-pointer-dereference-on-guest-invpcid.patch +ice-fix-crash-at-allocation-failure.patch