From: "Roth, Michael via groups.io" <Michael.Roth=amd.com@groups.io>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: <devel@edk2.groups.io>, Ray Ni <ray.ni@intel.com>,
Erdem Aktas <erdemaktas@google.com>,
Jiewen Yao <jiewen.yao@intel.com>, Min Xu <min.m.xu@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [edk2-devel] [PATCH] OvmfPkg/MemEncryptSevLib: Fix address overflow during PVALIDATE
Date: Wed, 15 Nov 2023 11:49:38 -0600 [thread overview]
Message-ID: <170007057809.809417.2600675499931811644@amd.com> (raw)
In-Reply-To: <bfdcjkqael4xje6zzeng3ndmjal4dwkran6r3ecmhcpmr364xe@dnxk2lska473>
Quoting Gerd Hoffmann (2023-11-13 04:48:10)
> On Fri, Nov 10, 2023 at 08:14:39PM -0600, Michael Roth wrote:
> > The struct used for GHCB-based page-state change requests uses a 40-bit
> > bit-field for the GFN, which is shifted by PAGE_SHIFT to generate a
> > 64-bit address. However, anything beyond 40-bits simply gets shifted off
> > when doing this, which will cause issues when dealing with 1TB+
> > addresses. Fix this by casting the 40-bit GFN values to 64-bit ones
> > prior to shifting it by PAGE_SHIFT.
> >
> > Fixes: ade62c18f474 ("OvmfPkg/MemEncryptSevLib: add support to validate system RAM")
> > Signed-off-by: Michael Roth <michael.roth@amd.com>
> > ---
> > .../BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c
> > index 85eb41585b..d52d2940e9 100644
> > --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c
> > +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c
> > @@ -78,13 +78,14 @@ PvalidateRange (
> > IN BOOLEAN Validate
> > )
> > {
> > - UINTN Address, RmpPageSize, Ret, i;
> > + UINTN RmpPageSize, Ret, i;
> > + EFI_PHYSICAL_ADDRESS Address;
> >
> > for ( ; StartIndex <= EndIndex; StartIndex++) {
> > //
> > // Get the address and the page size from the Info.
> > //
> > - Address = Info->Entry[StartIndex].GuestFrameNumber << EFI_PAGE_SHIFT;
> > + Address = ((UINT64)Info->Entry[StartIndex].GuestFrameNumber) << EFI_PAGE_SHIFT;
>
> Minor nit: why cast to UINT64 not EFI_PHYSICAL_ADDRESS?
My original thinking was that we were originally shifting a 40-bit
bit-field of a UINT64, so the minimal change is to cast it to a
normal UINT64 to fix the bit-field overflow. So I thought casting
to another type might obfuscate the fix a bit.
EFI_PHYSICAL_ADDRESS seems more correct all around though, so I've
sent a v2 with the suggested change.
Thanks!
-Mike
>
> Otherwise looks good to me.
>
> take care,
> Gerd
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111284): https://edk2.groups.io/g/devel/message/111284
Mute This Topic: https://groups.io/mt/102520474/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
prev parent reply other threads:[~2023-11-15 17:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-11 2:14 [edk2-devel] [PATCH] OvmfPkg/MemEncryptSevLib: Fix address overflow during PVALIDATE Roth, Michael via groups.io
2023-11-13 10:48 ` Gerd Hoffmann
2023-11-15 17:49 ` Roth, Michael via groups.io [this message]
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-list 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=170007057809.809417.2600675499931811644@amd.com \
--to=devel@edk2.groups.io \
/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