From: Sean Christopherson <seanjc@google.com>
To: coverity-bot <keescook@chromium.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
x86@kernel.org, Maxim Levitsky <mlevitsk@redhat.com>,
linux-kernel@vger.kernel.org, Borislav Petkov <bp@alien8.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
kvm@vger.kernel.org, Dave Hansen <dave.hansen@linux.intel.com>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
linux-next@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: Coverity: emulator_leave_smm(): Error handling issues
Date: Thu, 1 Dec 2022 18:18:45 +0000 [thread overview]
Message-ID: <Y4jwBahPrkwOI3w9@google.com> (raw)
In-Reply-To: <202212010825.8589611F@keescook>
On Thu, Dec 01, 2022, coverity-bot wrote:
> Hello!
>
> This is an experimental semi-automated report about issues detected by
> Coverity from a scan of next-20221201 as part of the linux-next scan project:
> https://scan.coverity.com/projects/linux-next-weekly-scan
>
> You're getting this email because you were associated with the identified
> lines of code (noted below) that were touched by commits:
>
> Wed Nov 9 12:31:18 2022 -0500
> 1d0da94cdafe ("KVM: x86: do not go through ctxt->ops when emulating rsm")
>
> Coverity reported the following:
>
> *** CID 1527763: Error handling issues (CHECKED_RETURN)
> arch/x86/kvm/smm.c:631 in emulator_leave_smm()
> 625 cr4 = kvm_read_cr4(vcpu);
> 626 if (cr4 & X86_CR4_PAE)
> 627 kvm_set_cr4(vcpu, cr4 & ~X86_CR4_PAE);
> 628
> 629 /* And finally go back to 32-bit mode. */
> 630 efer = 0;
> vvv CID 1527763: Error handling issues (CHECKED_RETURN)
> vvv Calling "kvm_set_msr" without checking return value (as is done elsewhere 5 out of 6 times).
> 631 kvm_set_msr(vcpu, MSR_EFER, efer);
> 632 }
> 633 #endif
> 634
> 635 /*
> 636 * Give leave_smm() a chance to make ISA-specific changes to the vCPU
>
> If this is a false positive, please let us know so we can mark it as
It's not a false positive per se, but absent a KVM bug the call can never fail.
Ditto for the kvm_set_cr{0,4}() calls above. That said, I'm tempted to "fix"
these since we've had bugs related to this code in the past. This doesn't seem
too ugly...
diff --git a/arch/x86/kvm/smm.c b/arch/x86/kvm/smm.c
index a9c1c2af8d94..621e39689bff 100644
--- a/arch/x86/kvm/smm.c
+++ b/arch/x86/kvm/smm.c
@@ -601,8 +601,9 @@ int emulator_leave_smm(struct x86_emulate_ctxt *ctxt)
/* Zero CR4.PCIDE before CR0.PG. */
cr4 = kvm_read_cr4(vcpu);
- if (cr4 & X86_CR4_PCIDE)
- kvm_set_cr4(vcpu, cr4 & ~X86_CR4_PCIDE);
+ if (cr4 & X86_CR4_PCIDE &&
+ WARN_ON_ONCE(kvm_set_cr4(vcpu, cr4 & ~X86_CR4_PCIDE)))
+ return X86EMUL_UNHANDLEABLE;
/* A 32-bit code segment is required to clear EFER.LMA. */
memset(&cs_desc, 0, sizeof(cs_desc));
@@ -614,8 +615,9 @@ int emulator_leave_smm(struct x86_emulate_ctxt *ctxt)
/* For the 64-bit case, this will clear EFER.LMA. */
cr0 = kvm_read_cr0(vcpu);
- if (cr0 & X86_CR0_PE)
- kvm_set_cr0(vcpu, cr0 & ~(X86_CR0_PG | X86_CR0_PE));
+ if (cr0 & X86_CR0_PE &&
+ WARN_ON_ONCE(kvm_set_cr0(vcpu, cr0 & ~(X86_CR0_PG | X86_CR0_PE))))
+ return X86EMUL_UNHANDLEABLE;
#ifdef CONFIG_X86_64
if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) {
@@ -623,12 +625,14 @@ int emulator_leave_smm(struct x86_emulate_ctxt *ctxt)
/* Clear CR4.PAE before clearing EFER.LME. */
cr4 = kvm_read_cr4(vcpu);
- if (cr4 & X86_CR4_PAE)
- kvm_set_cr4(vcpu, cr4 & ~X86_CR4_PAE);
+ if ((cr4 & X86_CR4_PAE &&
+ WARN_ON_ONCE(kvm_set_cr4(vcpu, cr4 & ~X86_CR4_PAE)))
+ return X86EMUL_UNHANDLEABLE;
/* And finally go back to 32-bit mode. */
efer = 0;
- kvm_set_msr(vcpu, MSR_EFER, efer);
+ if (WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_EFER, efer)))
+ return X86EMUL_UNHANDLEABLE;
}
#endif
next prev parent reply other threads:[~2022-12-01 18:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 16:25 Coverity: emulator_leave_smm(): Error handling issues coverity-bot
2022-12-01 18:18 ` Sean Christopherson [this message]
2022-12-01 23:22 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y4jwBahPrkwOI3w9@google.com \
--to=seanjc@google.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=gustavo@embeddedor.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox