From: Greg Kroah-Hartman Date: Sat, 6 Jul 2019 04:53:56 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.1.17~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a2cb4421c534c0685e2a1e620717300e53597f9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch --- diff --git a/queue-4.19/kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch b/queue-4.19/kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch new file mode 100644 index 00000000000..fdd090a7280 --- /dev/null +++ b/queue-4.19/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 +Date: Wed, 26 Jun 2019 14:16:13 +0200 +Subject: KVM: x86: degrade WARN to pr_warn_ratelimited + +From: Paolo Bonzini + +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 +Acked-by: Alexander Potapenko +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1447,7 +1447,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; + } + } +@@ -1457,8 +1457,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.19/series b/queue-4.19/series index 87309e9dd32..290272b8f37 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -79,3 +79,4 @@ sc16is7xx-move-label-err_spi-to-correct-section.patch net-hns-fix-unsigned-comparison-to-less-than-zero.patch bpf-fix-bpf_jit_limit-knob-for-page_size-64k.patch netfilter-ipv6-nf_defrag-accept-duplicate-fragments-.patch +kvm-x86-degrade-warn-to-pr_warn_ratelimited.patch