From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 327C1740045 for ; Mon, 13 Nov 2023 10:48:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Fy9ehRtJHw8SvzLQXgFspuRq3PD4S+NUCnj6l+WKEKM=; c=relaxed/simple; d=groups.io; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Disposition; s=20140610; t=1699872495; v=1; b=adTq0WirMXppavoac82R5yXh0UAYKLH50aFeRCNy0s6FrNxRTdy7hg3cqif8RkC3NU2HJE0U OSyalEKXGqA/j1gl5Yy6AUZnl6HbqbeMTg1+wIf1vS/SYbCxvobpmflDemIiCvpa5JVwbALQpwB dS0ilv3vMZFRkPBeNZw9bqCI= X-Received: by 127.0.0.2 with SMTP id SQuKYY7687511xvN6DT4XrAy; Mon, 13 Nov 2023 02:48:15 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.34273.1699872495193587077 for ; Mon, 13 Nov 2023 02:48:15 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-55vRJehTNVirUxNU1H7FbQ-1; Mon, 13 Nov 2023 05:48:12 -0500 X-MC-Unique: 55vRJehTNVirUxNU1H7FbQ-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E2A97811E88; Mon, 13 Nov 2023 10:48:11 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B30F21C060AE; Mon, 13 Nov 2023 10:48:11 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5282D1804A63; Mon, 13 Nov 2023 11:48:10 +0100 (CET) Date: Mon, 13 Nov 2023 11:48:10 +0100 From: "Gerd Hoffmann" To: Michael Roth Cc: devel@edk2.groups.io, Ray Ni , Erdem Aktas , Jiewen Yao , Min Xu , Tom Lendacky Subject: Re: [edk2-devel] [PATCH] OvmfPkg/MemEncryptSevLib: Fix address overflow during PVALIDATE Message-ID: References: <20231111021439.554450-1-michael.roth@amd.com> MIME-Version: 1.0 In-Reply-To: <20231111021439.554450-1-michael.roth@amd.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: kPSxc5Yvq7YrhnODFQzwChZmx7686176AA= Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=adTq0Wir; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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 > --- > .../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? Otherwise looks good to me. take care, Gerd -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111137): https://edk2.groups.io/g/devel/message/111137 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] -=-=-=-=-=-=-=-=-=-=-=-