From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.57]) by mx.groups.io with SMTP id smtpd.web10.14288.1674047063758647556 for ; Wed, 18 Jan 2023 05:04:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=j6VjwdZO; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.237.57, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PqH6D6V6jdJKazl5alh4RhY2ZC3iDmD2BR/GoAUDunGhHDuR/voD6+NrCfLGtXqlDBR5f+8fv1f2Ss/uVmGtfK3tJAcxlARrpA71MBcMjfuQ5gz4iuae54LOcRosWnOQHVvlyYM8zrGl1wpUmPD69oyQeVqODIIPXNSLSd5iVojS6YnLFdkS5lapl/kVcP+2UCBzxGuAPF1JttU9E2/eANOG+EfhFLnJTml7lQ8Xy9gh0T9FdmqN42TPKIK9lqAjRJt/3S53+8YXf2j8IA9FdQonm66AI2eXmuw4ti6nSogzTMRWCH6GXAe7Sq+ZzTlNluIyu1Nz5tjgc0dWGtmRdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=egAIdK+OO0p7RSmtr+rCeFHltPv8WjHa01MdZ+VDcMQ=; b=FUUiqgS8iI/BV7u/hPc4YOTqcGWFgJmyrgjgX6ZhQKS1Bi0XQWIuNW+bWhxN0bS+GjzNZG3AXiKdJ/FoUnl1tai0LAKSewWZPrm/CbblxaaC6FD6iPfF9pLpRHO/PRaum36joAdmQAsiTXCd/KvIz3tyMQUbrR7HkhOx8hmoDbpJufChUfe/i9UM85uw1YrF3I90sdZ7pulskpQDGpSJb2/4IMHUL9mMh0dIImooGSLjM7E04gZ8s23BQq1HwNziXroX7RxMy3b/HN9moHoW/TM+wTa3zgp/vwVjj4aztE44BSyviWmXXsV7NkzoRV7lf61dIYpzwmoQJq23HVhFWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=egAIdK+OO0p7RSmtr+rCeFHltPv8WjHa01MdZ+VDcMQ=; b=j6VjwdZOkVXqbGFum7AyPWJ1zefw469eALS1J1Uq14ls3JB5oWmnz2zSiMmPbik1IKO7tg2UQf7tSiW+3b4zq0OQk2C0/tpaclkJJOWPoST2YWeoebsqljHqgqs2gLkq6w/LpnueS8O2g+M5I3IKzwwekGcHOMXFSocB4wzz9Kc= Received: from CY5PR04CA0001.namprd04.prod.outlook.com (2603:10b6:930:1e::6) by DM4PR12MB6110.namprd12.prod.outlook.com (2603:10b6:8:ad::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Wed, 18 Jan 2023 13:04:21 +0000 Received: from CY4PEPF0000C97A.namprd02.prod.outlook.com (2603:10b6:930:1e:cafe::e5) by CY5PR04CA0001.outlook.office365.com (2603:10b6:930:1e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.19 via Frontend Transport; Wed, 18 Jan 2023 13:04:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000C97A.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6002.11 via Frontend Transport; Wed, 18 Jan 2023 13:04:21 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 18 Jan 2023 07:04:20 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 18 Jan 2023 05:04:20 -0800 Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Wed, 18 Jan 2023 07:04:18 -0600 From: "Abdul Lateef Attar" To: CC: Abdul Lateef Attar , Oram Isaac W , Eric Dong , Liming Gao Subject: [PATCH v3 1/2] BoardModulePkg: Copy device path before processing Date: Wed, 18 Jan 2023 18:34:12 +0530 Message-ID: <28e03e3b127cc52b2d675732892e207a572d7d53.1674047008.git.abdattar@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Return-Path: AbdulLateef.Attar@amd.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000C97A:EE_|DM4PR12MB6110:EE_ X-MS-Office365-Filtering-Correlation-Id: 55d04faf-99e6-4ea9-37bc-08daf95483f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Gf8SW26WpZo9MjP51HBiNqPaKsPQe4dNFupI0Rw8UzXznznO9b/HcpNhCarYCFkd+PBQQg90ld1fqFhYXBsFNQZr63MQj1N5BScSNKY8Qm8T7ZneHSVM/zu+dC28xjWagiHgZIHXQfjPQR35TqGXLXZcqvvxMOvC/FYCbuEfWNpuaxkracB0NXoIfnCkOjbzksnIHexL1AVxWpKkQAXM932jThRW+IRgijk6BsXv0bKXtlcCAaWXTR4Nwv3qq+ojX1sCloAeC0y73rtDMyBa0ZtS0fTdu+LN8E9fU92uaD6zZtl3Qww3tErGC8rXX2oSjrItsY0rsxiSFZ+2nJK0xYTu6ELz/ygBgdPTm2cFCDjtZYvwUIdkOMFltL/As93wUThF/+DR7aa6Z7KFtFrDeGNbXtd4RtCygD9MPBZvHXDkUqi+JAu1zi9AMdk+bK5WtJxo543gVPyrw2H/6gDdAq9KewlgT4S0a+aYrm2qsiW7LZQFC/QUu3/izF6Nnc0oiJ2aSI7zhhS4mppJ285oNGWjFYkRao1MdT1tWJYdS6GYl/SxtLuYWJtvUjVKcq8u+JyljbXwBSqbXQfv0wjkYudXZBIT1/kjNDDqV+FznhoucNMVycR1OTgkBhHOYZUJ5swBymdmkjjZV6JDVZmCJAH1R4iiUEjZKrjGGb3ru+0C4bNKQ24P/TqDo87HsCbY+ZLx6cNBsMQU+KIC42P5AscqHJlY8PFWivnwzafDqk= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(376002)(346002)(136003)(39860400002)(396003)(451199015)(40470700004)(46966006)(36840700001)(5660300002)(40460700003)(2906002)(26005)(478600001)(54906003)(316002)(36756003)(2616005)(82310400005)(36860700001)(426003)(47076005)(83380400001)(356005)(7696005)(82740400003)(81166007)(40480700001)(186003)(8936002)(6666004)(8676002)(336012)(6916009)(70206006)(70586007)(4326008)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 13:04:21.1773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55d04faf-99e6-4ea9-37bc-08daf95483f6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000C97A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6110 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain GCC compiler puts the DevicePath PCDs to the read-only section. During boot if try to process the device path after PtrGetPtr it throws a page fault exception. Hence making a local copy using DuplicateDevicePath() to avoid the page fault exception. Cc: Oram Isaac W Cc: Eric Dong Cc: Liming Gao Signed-off-by: Abdul Lateef Attar --- .../Library/BoardBdsHookLib/BoardBdsHookLib.c | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds= HookLib.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsH= ookLib.c index 0bcee7c9a4ba..e866f70bc336 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c @@ -3,6 +3,7 @@ implementation instance of the BDS hook library=0D =0D Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D + Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
= =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -131,7 +132,7 @@ IsTrustedConsole ( =0D switch (ConsoleType) {=0D case ConIn:=0D - TrustedConsoleDevicepath =3D PcdGetPtr (PcdTrustedConsoleInputDevice= Path);=0D + TrustedConsoleDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrus= tedConsoleInputDevicePath));=0D break;=0D case ConOut:=0D //=0D @@ -147,7 +148,7 @@ IsTrustedConsole ( TempDevicePath =3D NextDevicePathNode (TempDevicePath);=0D }=0D =0D - TrustedConsoleDevicepath =3D PcdGetPtr (PcdTrustedConsoleOutputDevic= ePath);=0D + TrustedConsoleDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrus= tedConsoleOutputDevicePath));=0D break;=0D default:=0D ASSERT (FALSE);=0D @@ -164,6 +165,9 @@ IsTrustedConsole ( if (CompareMem (ConsoleDevice, Instance, Size - END_DEVICE_PATH_LENGTH= ) =3D=3D 0) {=0D FreePool (Instance);=0D FreePool (ConsoleDevice);=0D + if (TempDevicePath !=3D NULL) {=0D + FreePool (TempDevicePath);=0D + }=0D return TRUE;=0D }=0D =0D @@ -171,7 +175,9 @@ IsTrustedConsole ( } while (TempDevicePath !=3D NULL);=0D =0D FreePool (ConsoleDevice);=0D -=0D + if (TempDevicePath !=3D NULL) {=0D + FreePool (TempDevicePath);=0D + }=0D return FALSE;=0D }=0D =0D @@ -624,7 +630,7 @@ ConnectTrustedStorage ( EFI_STATUS Status;=0D EFI_HANDLE DeviceHandle;=0D =0D - TrustedStorageDevicepath =3D PcdGetPtr (PcdTrustedStorageDevicePath);=0D + TrustedStorageDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrustedS= torageDevicePath));=0D DumpDevicePath (L"TrustedStorage", TrustedStorageDevicepath);=0D =0D TempDevicePath =3D TrustedStorageDevicepath;=0D @@ -649,6 +655,10 @@ ConnectTrustedStorage ( =0D FreePool (Instance);=0D } while (TempDevicePath !=3D NULL);=0D +=0D + if (TempDevicePath !=3D NULL) {=0D + FreePool (TempDevicePath);=0D + }=0D }=0D =0D =0D @@ -1031,7 +1041,7 @@ AddConsoleVariable ( EFI_HANDLE GraphicsControllerHandle;=0D EFI_DEVICE_PATH *GopDevicePath;=0D =0D - TempDevicePath =3D ConsoleDevicePath;=0D + TempDevicePath =3D DuplicateDevicePath (ConsoleDevicePath);=0D do {=0D Instance =3D GetNextDevicePathInstance (&TempDevicePath, &Size);=0D if (Instance =3D=3D NULL) {=0D @@ -1074,6 +1084,10 @@ AddConsoleVariable ( =0D FreePool (Instance);=0D } while (TempDevicePath !=3D NULL);=0D +=0D + if (TempDevicePath !=3D NULL) {=0D + FreePool (TempDevicePath);=0D + }=0D }=0D =0D =0D --=20 2.25.1