From 6507ff8d5b0edbd72adefeaf0fff5a27c8aecd0e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 09:13:19 +0200 Subject: [PATCH] fuzz cleanup --- ...4-fix-kvm_reset_vcpu-return-code-being-incor.patch | 11 +++-------- ...4-fix-kvm_reset_vcpu-return-code-being-incor.patch | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch b/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch index f58ae866c41..0301ced4d82 100644 --- a/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch +++ b/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch @@ -20,14 +20,12 @@ Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20200617105456.28245-1-steven.price@arm.com Signed-off-by: Sasha Levin --- - arch/arm64/kvm/reset.c | 10 +++++++--- + arch/arm64/kvm/reset.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c -index f4a8ae9188275..784d485218ca1 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c -@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) +@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struc int kvm_reset_vcpu(struct kvm_vcpu *vcpu) { const struct kvm_regs *cpu_reset; @@ -36,7 +34,7 @@ index f4a8ae9188275..784d485218ca1 100644 bool loaded; /* Reset PMU outside of the non-preemptible section */ -@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) +@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu if (test_bit(KVM_ARM_VCPU_PTRAUTH_ADDRESS, vcpu->arch.features) || test_bit(KVM_ARM_VCPU_PTRAUTH_GENERIC, vcpu->arch.features)) { @@ -58,6 +56,3 @@ index f4a8ae9188275..784d485218ca1 100644 cpu_reset = &default_regs_reset32; } else { cpu_reset = &default_regs_reset; --- -2.25.1 - diff --git a/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch b/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch index 8ef0db8149f..fe5defcba16 100644 --- a/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch +++ b/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch @@ -20,14 +20,12 @@ Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20200617105456.28245-1-steven.price@arm.com Signed-off-by: Sasha Levin --- - arch/arm64/kvm/reset.c | 10 +++++++--- + arch/arm64/kvm/reset.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c -index 30b7ea680f66c..ab76728e27426 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c -@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) +@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struc int kvm_reset_vcpu(struct kvm_vcpu *vcpu) { const struct kvm_regs *cpu_reset; @@ -36,7 +34,7 @@ index 30b7ea680f66c..ab76728e27426 100644 bool loaded; /* Reset PMU outside of the non-preemptible section */ -@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) +@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu if (test_bit(KVM_ARM_VCPU_PTRAUTH_ADDRESS, vcpu->arch.features) || test_bit(KVM_ARM_VCPU_PTRAUTH_GENERIC, vcpu->arch.features)) { @@ -58,6 +56,3 @@ index 30b7ea680f66c..ab76728e27426 100644 cpu_reset = &default_regs_reset32; } else { cpu_reset = &default_regs_reset; --- -2.25.1 - -- 2.47.3