From nobody Thu Apr 25 09:04:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153451655041888.94373497091692; Fri, 17 Aug 2018 07:35:50 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D97F0210F4757; Fri, 17 Aug 2018 07:35:44 -0700 (PDT) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0EBF3210F474C for ; Fri, 17 Aug 2018 07:35:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51B7C26379; Fri, 17 Aug 2018 14:35:41 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-113.rdu2.redhat.com [10.10.120.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F9401745B; Fri, 17 Aug 2018 14:35:40 +0000 (UTC) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org From: Laszlo Ersek To: edk2-devel-01 Date: Fri, 17 Aug 2018 16:35:33 +0200 Message-Id: <20180817143534.28393-4-lersek@redhat.com> In-Reply-To: <20180817143534.28393-1-lersek@redhat.com> References: <20180817143534.28393-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 14:35:41 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 14:35:41 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: [edk2] [PATCH 3/4] NetworkPkg/TlsAuthConfigDxe: fix TlsCaCertificate attributes retrieval X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Siyuan Fu , Jiaxin Wu , Songpeng Li MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RDMRC_1 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Per spec, the GetVariable() runtime service is not required to populate (*Attributes) on output when it fails with EFI_BUFFER_TOO_SMALL. Therefore we have to fetch the full contents of the TlsCaCertificate variable temporarily, just so we can (a) get the current attributes, and (b) add EFI_VARIABLE_APPEND_WRITE to them for the subsequent SetVariable() call. Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Songpeng Li Reported-by: Songpeng Li Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1090 Fixes: b90c335fbbb674470fbf09601cc522bf61564c30 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek --- Notes: Tested via loading the same CA cert .pem file twice in a row, using the HII form, first without any pre-existent TlsCaCertificate variable. =20 Songpeng, can you please test this patch as well, and confirm if it works on your end? Thanks! NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 27 +++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/T= lsAuthConfigDxe/TlsAuthConfigImpl.c index 7259c5e82f61..0780b03bbab4 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -663,6 +663,7 @@ EnrollX509toVariable ( EFI_SIGNATURE_LIST *CACert; EFI_SIGNATURE_DATA *CACertData; VOID *Data; + VOID *CurrentData; UINTN DataSize; UINTN SigDataSize; UINT32 Attr; @@ -674,6 +675,7 @@ EnrollX509toVariable ( CACert =3D NULL; CACertData =3D NULL; Data =3D NULL; + CurrentData =3D NULL; Attr =3D 0; =20 Status =3D ReadFileContent ( @@ -716,11 +718,30 @@ EnrollX509toVariable ( Status =3D gRT->GetVariable( VariableName, &gEfiTlsCaCertificateGuid, - &Attr, + NULL, &DataSize, NULL ); if (Status =3D=3D EFI_BUFFER_TOO_SMALL) { + // + // Per spec, we have to fetch the variable's contents, even though we'= re + // only interested in the variable's attributes. + // + CurrentData =3D AllocatePool (DataSize); + if (CurrentData =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ON_EXIT; + } + Status =3D gRT->GetVariable( + VariableName, + &gEfiTlsCaCertificateGuid, + &Attr, + &DataSize, + CurrentData + ); + if (EFI_ERROR (Status)) { + goto ON_EXIT; + } Attr |=3D EFI_VARIABLE_APPEND_WRITE; } else if (Status =3D=3D EFI_NOT_FOUND) { Attr =3D TLS_AUTH_CONFIG_VAR_BASE_ATTR; @@ -751,6 +772,10 @@ ON_EXIT: FreePool (Data); } =20 + if (CurrentData !=3D NULL) { + FreePool (CurrentData); + } + if (X509Data !=3D NULL) { FreePool (X509Data); } --=20 2.14.1.3.gb7cf6e02401b _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel