From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mx.groups.io with SMTP id smtpd.web10.5678.1621920691622584728 for ; Mon, 24 May 2021 22:31:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=ShP09NQE; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: dovmurik@linux.ibm.com) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 14P54dAD158091; Tue, 25 May 2021 01:31:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=qq2gGEEGOuTd9Y+Noh1wVCwfO933tV4HowRdHhKE/Hg=; b=ShP09NQEIND2wb3lrD4FG/si7Ucc2R9qtWBDsGSsArcdkQitg/11kYqu2suoy3cCLQDn JThm28xJRdyprxYqh76TeCJi8izJkos8iBYzUOoa5I/q/a/LOCWfukr7vu4TmJ0JD7L3 qpQ4fcFw2qv8QNPEvxi7czcBiE8yAjisXI4KXDMiXjK6mHo9O2YLDyBHLsSS17iTNpYX oUbvNOzK1e03V7/SCIjn0Fv6+GZHJXbSXg/Y30DLJUqeaNqWwXIBPXqCGWSQ/RFaWSnF aOoEwPt5SSAno2zTXKylKynAb3q69t1SV4ZTwtj+BsLgNPwMDP+aaRmrdAzl1mqVUNi3 ew== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 38rryak5ac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 May 2021 01:31:28 -0400 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 14P55N6T162383; Tue, 25 May 2021 01:31:27 -0400 Received: from ppma03wdc.us.ibm.com (ba.79.3fa9.ip4.static.sl-reverse.com [169.63.121.186]) by mx0a-001b2d01.pphosted.com with ESMTP id 38rryak595-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 May 2021 01:31:27 -0400 Received: from pps.filterd (ppma03wdc.us.ibm.com [127.0.0.1]) by ppma03wdc.us.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 14P5R8tA025079; Tue, 25 May 2021 05:31:26 GMT Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by ppma03wdc.us.ibm.com with ESMTP id 38psk94fkv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 May 2021 05:31:26 +0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 14P5VP1G29884910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 05:31:25 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 54D682805A; Tue, 25 May 2021 05:31:25 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11D212805C; Tue, 25 May 2021 05:31:25 +0000 (GMT) Received: from localhost.localdomain (unknown [9.2.130.16]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 25 May 2021 05:31:25 +0000 (GMT) From: Dov Murik To: devel@edk2.groups.io Cc: Dov Murik , Tobin Feldman-Fitzthum , Tobin Feldman-Fitzthum , Jim Cadden , James Bottomley , Hubertus Franke , Laszlo Ersek , Ard Biesheuvel , Jordan Justen , Ashish Kalra , Brijesh Singh , Erdem Aktas , Jiewen Yao , Min Xu , Tom Lendacky Subject: [PATCH v1 8/8] OvmfPkg/AmdSev: add SevQemuLoadImageLib Date: Tue, 25 May 2021 05:31:16 +0000 Message-Id: <20210525053116.1533673-9-dovmurik@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525053116.1533673-1-dovmurik@linux.ibm.com> References: <20210525053116.1533673-1-dovmurik@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: jMJpPhGvaSNYq3FMIOrBGGf5_Yybhgp0 X-Proofpoint-ORIG-GUID: LcmFT4nUExCBiOVq1Oyi9yiMgEBAQGGT X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-05-25_02:2021-05-24,2021-05-25 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250034 Content-Transfer-Encoding: quoted-printable From: James Bottomley This is a wrapper library around GenericQemuLoadImageLib which activates a verifier on the command line to check its hash against the one passed in via the SEV hash table. The verifier is enabled if SEV memory encryption is active. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Ashish Kalra Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Min Xu Cc: Tom Lendacky Signed-off-by: James Bottomley --- OvmfPkg/AmdSev/AmdSevX64.dsc | 4 +- OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.inf | 30 ++= +++++++++ OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.c | 52 ++= ++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index bfb16798b3b7..9db3d993dda0 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -284,7 +284,6 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf=0D QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf= =0D - QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoad= ImageLib.inf=0D PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf=0D =0D @@ -372,7 +371,8 @@ [LibraryClasses.common.DXE_DRIVER] PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf=0D QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf= =0D - QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib= .inf=0D + GenericQemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQ= emuLoadImageLib.inf=0D + QemuLoadImageLib|OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadI= mageLib.inf=0D !if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.i= nf=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in= f=0D diff --git a/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib= .inf b/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.inf new file mode 100644 index 000000000000..b87031f4d15a --- /dev/null +++ b/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.inf @@ -0,0 +1,30 @@ +## @file=0D +# Provides the Secure Verification services for AMD SEV firmware config=0D +#=0D +# Copyright (C) 2021 James Bottomley, IBM Corporation.=0D +#=0D +# SPDX-License-Identifier: BSD-2-Clause-Patent=0D +#=0D +##=0D +=0D +[Defines]=0D + INF_VERSION =3D 1.27=0D + BASE_NAME =3D SevQemuLoadImageLib=0D + FILE_GUID =3D 7ceec418-e1e3-42fb-91c5-56abc6d3744d= =0D + MODULE_TYPE =3D BASE=0D + VERSION_STRING =3D 1.0=0D + LIBRARY_CLASS =3D QemuLoadImageLib|DXE_DRIVER=0D + CONSTRUCTOR =3D SevQemuLoadImageConstructor=0D +=0D +[Sources]=0D + SevQemuLoadImageLib.c=0D +=0D +[Packages]=0D + MdePkg/MdePkg.dec=0D + OvmfPkg/OvmfPkg.dec=0D +=0D +[LibraryClasses]=0D + DebugLib=0D + GenericQemuLoadImageLib=0D + MemEncryptSevLib=0D + SevHashFinderLib=0D diff --git a/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib= .c b/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.c new file mode 100644 index 000000000000..a44d296cea78 --- /dev/null +++ b/OvmfPkg/AmdSev/Library/SevQemuLoadImageLib/SevQemuLoadImageLib.c @@ -0,0 +1,52 @@ +/** @file=0D + AMD SEV Firmware Config file verifier=0D +=0D + Copyright (C) 2021 James Bottomley, IBM Corporation.=0D + SPDX-License-Identifier: BSD-2-Clause-Patent=0D +**/=0D +=0D +#include =0D +=0D +#include =0D +#include =0D +#include =0D +#include =0D +=0D +STATIC EFI_STATUS=0D +EFIAPI=0D +SevCmdLineVerifier (=0D + IN CONST CHAR16 *Name,=0D + IN VOID *Buffer,=0D + IN UINTN Size=0D + )=0D +{=0D + DEBUG ((DEBUG_INFO, "%a: Validating Hash\n", __FUNCTION__));=0D +=0D + return ValidateHashEntry (&SEV_CMDLINE_HASH_GUID, Buffer, Size);=0D +}=0D +=0D +/**=0D + Register security measurement handler.=0D +=0D + @param ImageHandle ImageHandle of the loaded driver.=0D + @param SystemTable Pointer to the EFI System Table.=0D +=0D + @retval EFI_SUCCESS The handlers were registered successfully.=0D +**/=0D +EFI_STATUS=0D +EFIAPI=0D +SevQemuLoadImageConstructor (=0D + VOID=0D + )=0D +{=0D + if (MemEncryptSevIsEnabled ()) {=0D + DEBUG ((DEBUG_INFO, "Enabling hash verification of fw_cfg cmdline\n"))= ;=0D + return RegisterFwCfgVerifier (SevCmdLineVerifier);=0D + } else {=0D + //=0D + // Don't install verifier if SEV isn't enabled=0D + //=0D + DEBUG ((DEBUG_INFO, "NOT Enabling hash verification of fw_cfg cmdline\= n"));=0D + return EFI_SUCCESS;=0D + }=0D +}=0D --=20 2.25.1