Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6472f50 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Greg Kroah-Hartman
Browse files

KVM: x86: degrade WARN to pr_warn_ratelimited 



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: default avatar <syzbot+c03f30b4f4c46bdf8575@syzkaller.appspotmail.com>
Suggested-by: default avatarAlexander Potapenko <glider@google.com>
Acked-by: default avatarAlexander Potapenko <glider@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac0024ba

arch/x86/kvm/x86.c

+3 −3
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) 
			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,7 +1457,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) 
				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",

		pr_warn_ratelimited("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n",

			            user_tsc_khz);

		return -1;

	}