From: Sasha Levin <sashal@kernel.org>
Date: Mon, 15 Feb 2021 19:40:55 +0000 (-0500)
Subject: Fix backport of kvm-x86-cleanup-cr3-reserved-bits-checks.patch to 5.10
X-Git-Tag: v5.4.99~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d29ea3b2683cab599f7abcd33f933dff8b804c0;p=thirdparty%2Fkernel%2Fstable-queue.git

Fix backport of kvm-x86-cleanup-cr3-reserved-bits-checks.patch to 5.10

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-5.10/kvm-x86-cleanup-cr3-reserved-bits-checks.patch b/queue-5.10/kvm-x86-cleanup-cr3-reserved-bits-checks.patch
index 1ed091f7501..8f68d8f0ac5 100644
--- a/queue-5.10/kvm-x86-cleanup-cr3-reserved-bits-checks.patch
+++ b/queue-5.10/kvm-x86-cleanup-cr3-reserved-bits-checks.patch
@@ -83,7 +83,7 @@ index 18a315bbcb79e..3bcde449938e6 100644
  		    || !(sregs->efer & EFER_LMA))
  			return -EINVAL;
 +		if (sregs->cr3 & vcpu->arch.cr3_lm_rsvd_bits)
-+			return false;
++			return -EINVAL;
  	} else {
  		/*
  		 * Not in 64-bit mode: EFER.LMA is clear and the code