From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 6 Jul 2019 04:53:42 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v5.1.17~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc559eaec63dd0e019b20e023894c388e9cc6393;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch
---

diff --git a/queue-4.14/kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch b/queue-4.14/kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch
new file mode 100644
index 00000000000..8e4f46df914
--- /dev/null
+++ b/queue-4.14/kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch
@@ -0,0 +1,44 @@
+From 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Wed, 26 Jun 2019 14:16:13 +0200
+Subject: KVM: x86: degrade WARN to pr_warn_ratelimited
+
+From: Paolo Bonzini <pbonzini@redhat.com>
+
+commit 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee upstream.
+
+This warning can be triggered easily by userspace, so it should certainly not
+cause a panic if panic_on_warn is set.
+
+Reported-by: syzbot+c03f30b4f4c46bdf8575@syzkaller.appspotmail.com
+Suggested-by: Alexander Potapenko <glider@google.com>
+Acked-by: Alexander Potapenko <glider@google.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/x86.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -1392,7 +1392,7 @@ static int set_tsc_khz(struct kvm_vcpu *
+ 			vcpu->arch.tsc_always_catchup = 1;
+ 			return 0;
+ 		} else {
+-			WARN(1, "user requested TSC rate below hardware speed\n");
++			pr_warn_ratelimited("user requested TSC rate below hardware speed\n");
+ 			return -1;
+ 		}
+ 	}
+@@ -1402,8 +1402,8 @@ static int set_tsc_khz(struct kvm_vcpu *
+ 				user_tsc_khz, tsc_khz);
+ 
+ 	if (ratio == 0 || ratio >= kvm_max_tsc_scaling_ratio) {
+-		WARN_ONCE(1, "Invalid TSC scaling ratio - virtual-tsc-khz=%u\n",
+-			  user_tsc_khz);
++		pr_warn_ratelimited("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n",
++			            user_tsc_khz);
+ 		return -1;
+ 	}
+ 
diff --git a/queue-4.14/series b/queue-4.14/series
index 57080a073d6..08a5d245d1e 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -47,3 +47,4 @@ vhost-vsock-add-weight-support.patch
 vhost-scsi-add-weight-support.patch
 tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch
 arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch
+kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch