From nobody Sun May 19 01:26:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+95474+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95474+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1666389550; cv=none; d=zohomail.com; s=zohoarc; b=M5cCX7fqHUsTG1KL9lwrEDk2ql0Wd8jbbx9PD9qKWXSAyT5BH8DTdbCWtf+cAPcaWqReoCFV2tUVJroWtWHJr6nKiLOAOJiYErbgsMJbOifAWPOIyZChFv0lf4mvgzKt6l+lpvEFtIJkmY3ESt7S9V/AFcf00FM82pXx+ajMvpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666389550; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=a6orBidSQU0AWVfTQ2L1XTmRBlvpwmEeXbr9b90weSQ=; b=Hvc0KtpOZBwULar4cDGYhDyJbSvZcytj6RUZi/ic30Xm2pq7YvRrThjvhf0JfsMB9lFiM+Oijtc3EZd/S7bgNl1iWCxi4TuGZEuiaDuTaTqnhRT5Qj7t44mIOB+igqSEIkQVskcdKhKB28aRLmUjwQY6xL8Hq/WNgUlH3h8wrfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95474+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1666389550071543.2272432202997; Fri, 21 Oct 2022 14:59:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JxycYY1788612xeWioJFyCTk; Fri, 21 Oct 2022 14:59:08 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web09.573.1666389547752780286 for ; Fri, 21 Oct 2022 14:59:07 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="369178035" X-IronPort-AV: E=Sophos;i="5.95,203,1661842800"; d="scan'208";a="369178035" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 14:59:07 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="805719078" X-IronPort-AV: E=Sophos;i="5.95,203,1661842800"; d="scan'208";a="805719078" X-Received: from nldesimo-desk1.amr.corp.intel.com ([10.24.80.62]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 14:59:07 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Liming Gao , Guomin Jiang , Jian J Wang , Michael D Kinney Subject: [edk2-devel] [PATCH V1] MdeModulePkg: Memory Corruption Error in CapsuleRuntimeDxe Date: Fri, 21 Oct 2022 14:58:57 -0700 Message-Id: <20221021215857.1955-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,nathaniel.l.desimone@intel.com X-Gm-Message-State: Dh63BcoJXRYfJW2jVeJGiDEXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1666389548; bh=5ZMkuZvS+ZqNWQZvOaTdwrJSTo/D5wLk4KsIEZC1zmw=; h=Cc:Date:From:Reply-To:Subject:To; b=rP6k1Qi2p2bfv8RnjnTfZ2CJ6Ic+fKWfipfUcjlRl/SHPVXzDGRJS1ykkaY2Jlhy1qw bSLPSheT5/tf3Mm55wwfUSOn2/Zg0qZAzSorfXjwcT02K1KHJ1sqBUBf9tZJliwFV51Fa bpJt6O0JdXxx7CybhbQe/bXQOB9USTllwuk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1666389552178100003 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4112 In AllocateReservedMemoryBelow4G(), if gBS->AllocatePages() returns an error, and ASSERTs are disabled, then the function will overwrite memory from 0xFFFFFFFF -> (0xFFFFFFFF + Size). Cc: Liming Gao Cc: Guomin Jiang Cc: Jian J Wang Cc: Michael D Kinney Signed-off-by: Nate DeSimone --- .../X64/SaveLongModeContext.c | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeConte= xt.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c index dab297dd0a..9306353bda 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c @@ -59,7 +59,14 @@ AllocateReservedMemoryBelow4G ( Pages, &Address ); - ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "ERROR AllocateReservedMemoryBelow4G(): %r\n", St= atus)); + return NULL; + } + if (Address =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "ERROR AllocateReservedMemoryBelow4G(): AllocateP= ages() returned NULL")); + return NULL; + } =20 Buffer =3D (VOID *)(UINTN)Address; ZeroMem (Buffer, Size); @@ -159,14 +166,23 @@ PrepareContextForCapsulePei ( DEBUG ((DEBUG_INFO, "CapsuleRuntimeDxe X64 TotalPagesNum - 0x%x pages\n"= , TotalPagesNum)); =20 LongModeBuffer.PageTableAddress =3D (EFI_PHYSICAL_ADDRESS)(UINTN)Allocat= eReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum)); - ASSERT (LongModeBuffer.PageTableAddress !=3D 0); + if (LongModeBuffer.PageTableAddress =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be sav= ed, ")); + DEBUG ((DEBUG_ERROR, "PageTableAddress allocation failed. Capsule in P= EI may fail!\n")); + return; + } =20 // // Allocate stack // LongModeBuffer.StackSize =3D PcdGet32 (PcdCapsulePeiLongModeStack= Size); LongModeBuffer.StackBaseAddress =3D (EFI_PHYSICAL_ADDRESS)(UINTN)Allocat= eReservedMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize)); - ASSERT (LongModeBuffer.StackBaseAddress !=3D 0); + if (LongModeBuffer.StackBaseAddress =3D=3D 0) { + DEBUG ((DEBUG_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be sav= ed, ")); + DEBUG ((DEBUG_ERROR "StackBaseAddress allocation failed. Capsule in PE= I may fail!\n")); + gBS->FreePages (LongModeBuffer.PageTableAddress, TotalPagesNum); + return; + } =20 Status =3D gRT->SetVariable ( EFI_CAPSULE_LONG_MODE_BUFFER_NAME, @@ -189,6 +205,7 @@ PrepareContextForCapsulePei ( ); } else { DEBUG ((DEBUG_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be sav= ed: %r. Capsule in PEI may fail!\n", Status)); + gBS->FreePages (LongModeBuffer.PageTableAddress, TotalPagesNum); gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (Lo= ngModeBuffer.StackSize)); } } --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95474): https://edk2.groups.io/g/devel/message/95474 Mute This Topic: https://groups.io/mt/94485995/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-