From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5658E2118EF4D for ; Mon, 19 Nov 2018 22:44:50 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id w73so505536pfk.10 for ; Mon, 19 Nov 2018 22:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=EY1XwJuG1wrmqnlvGIRlYVBgrc/QK+M8mo6TgvtR0AE=; b=PBFrL/fvnS3ALqpvbe/Y/vBmw6fU+tQk7vMGnl9ycyAIdSangscTLb31jiSdgjrpIV 0PYofposOO0WSFI7c2qBQUJqsmBL12hwKmH1R3VcOTRt11bMIuSWbp+2MhaFc5h8gUv2 qHyXN5X3HZ6OFpoVi045raihtZj86FDkF2O6s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=EY1XwJuG1wrmqnlvGIRlYVBgrc/QK+M8mo6TgvtR0AE=; b=jAlidgljXFMQZM2JznH9cFcrkpyV5V7vvcjQlF3WcOD9BtGm6IkdhIeinPJAYeoQS4 ncCa5E/3s6eHsAvmlJly19LBjXCGMtPKkU2oyyUhZURjsmAscL8xwGkrXNvGuy1ImW6u HlSUWnS5cvDJtaMkNlkPJY4Cs++0jqtVuvnLCFSFZeJonohRKUroU9N9vZyJXs2WEBqh OkSWzsrzAjZp2C8tX24Jgxs99VQaelwmYOaZrnY9NigqIzhYpKGbFaPm9rQ1mXjYaNis IWokwKp00Pufxnkpt6B/H4B8E0uzdP3SDvLrimBUNtVxp80tPdZLVPrrjvK9c+fZpRgo IQhQ== X-Gm-Message-State: AA+aEWb2CMTa7mNtUJ+o/XcTGYa5CCm1UXJ0mO6os4S6r9tLEa3zYGoJ U8xEYq8UXqJxDESKuFL5NfMoIA== X-Google-Smtp-Source: AFSGD/X2kW/MEVCOI+iqpkElDZe7IaCikxnwiJyN1GhfyTbp/5TIwRA5NG/5hsAm5yJ3heCjk8xSAg== X-Received: by 2002:a63:d208:: with SMTP id a8mr798427pgg.77.1542696289830; Mon, 19 Nov 2018 22:44:49 -0800 (PST) Received: from [10.139.0.118] ([64.64.108.162]) by smtp.gmail.com with ESMTPSA id k24sm36635545pfj.13.2018.11.19.22.44.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 22:44:49 -0800 (PST) To: Ard Biesheuvel Cc: Leif Lindholm , linaro-uefi , "edk2-devel@lists.01.org" , Graeme Gregory , "Kinney, Michael D" , Laszlo Ersek , wanghuiqiang , huangming , Jason Zhang , huangdaode@hisilicon.com, John Garry , Xinliang Liu , zhangfeng56@huawei.com References: <20181116065702.30559-1-ming.huang@linaro.org> <20181116065702.30559-8-ming.huang@linaro.org> From: Ming Huang Message-ID: Date: Tue, 20 Nov 2018 14:44:39 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Subject: Re: [PATCH edk2-platforms v2 07/15] Hisilicon/D0x: Fix secure boot bug in FlashFvbDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 06:44:50 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/20/2018 2:19 AM, Ard Biesheuvel wrote: > On Thu, 15 Nov 2018 at 22:57, Ming Huang wrote: >> >> When SECURE_BOOT_ENABLE is TRUE, FlashFvbDxe should use >> gEfiAuthenticatedVariableGuid, When SECURE_BOOT_ENABLE >> is FALSE, gEfiVariableGuid should be used. >> > > Can we fix the driver instead so we don't need to make this distinction? Yes, modify it as below patch. Thank you. > > Please refer to commit 8753858f84768fa6fa17191b86c97538457723ce in the > EDK2 for some background. > >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ming Huang >> --- >> Silicon/Hisilicon/HisiPkg.dec | 1 + >> Platform/Hisilicon/D03/D03.dsc | 5 +++++ >> Platform/Hisilicon/D05/D05.dsc | 5 +++++ >> Platform/Hisilicon/D06/D06.dsc | 5 +++++ >> Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 2 ++ >> Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c | 14 ++++++++++++-- >> 6 files changed, 30 insertions(+), 2 deletions(-) >> >> diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec >> index 404a3ae4af9d..af9359e4d0e0 100644 >> --- a/Silicon/Hisilicon/HisiPkg.dec >> +++ b/Silicon/Hisilicon/HisiPkg.dec >> @@ -278,6 +278,7 @@ [PcdsFixedAtBuild] >> >> gHisiTokenSpaceGuid.Pcdsoctype|0|UINT32|0x00000061 >> gHisiTokenSpaceGuid.PcdSerDesFlowCtrlFlag|0|UINT32|0x40000056 >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE|BOOLEAN|0x40000058 >> >> [PcdsFeatureFlag] >> gHisiTokenSpaceGuid.PcdIsItsSupported|FALSE|BOOLEAN|0x00000065 >> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc >> index aa1da5d61f83..ba3096672db0 100644 >> --- a/Platform/Hisilicon/D03/D03.dsc >> +++ b/Platform/Hisilicon/D03/D03.dsc >> @@ -281,6 +281,11 @@ [PcdsFixedAtBuild.common] >> gHisiTokenSpaceGuid.PcdHb0Rb2IoSize|0xffff #64K >> >> gHisiTokenSpaceGuid.Pcdsoctype|0x1610 >> + !if $(SECURE_BOOT_ENABLE) == TRUE >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE >> + !else >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE >> + !endif >> >> ################################################################################ >> # >> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc >> index 1040466633ef..b8500cef8742 100644 >> --- a/Platform/Hisilicon/D05/D05.dsc >> +++ b/Platform/Hisilicon/D05/D05.dsc >> @@ -422,6 +422,11 @@ [PcdsFixedAtBuild.common] >> gHisiTokenSpaceGuid.PcdHb1Rb7IoSize|0x10000 #64K >> >> gHisiTokenSpaceGuid.Pcdsoctype|0x1610 >> + !if $(SECURE_BOOT_ENABLE) == TRUE >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE >> + !else >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE >> + !endif >> >> ################################################################################ >> # >> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc >> index 1a479c160e80..b6ef9fedf0a7 100644 >> --- a/Platform/Hisilicon/D06/D06.dsc >> +++ b/Platform/Hisilicon/D06/D06.dsc >> @@ -243,6 +243,11 @@ [PcdsFixedAtBuild.common] >> >> gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE >> gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 >> + !if $(SECURE_BOOT_ENABLE) == TRUE >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE >> + !else >> + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE >> + !endif >> >> ################################################################################ >> # >> diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf >> index f8be4741ef7c..47965a707032 100644 >> --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf >> +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf >> @@ -44,6 +44,7 @@ [LibraryClasses] >> UefiRuntimeLib >> >> [Guids] >> + gEfiAuthenticatedVariableGuid >> gEfiSystemNvDataFvGuid >> gEfiVariableGuid >> >> @@ -62,6 +63,7 @@ [Pcd.common] >> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize >> >> gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked >> + gHisiTokenSpaceGuid.PcdIsSecureBoot >> gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress >> >> [Depex] >> diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c >> index e18cc9e06ec2..309941d6fe4d 100644 >> --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c >> +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c >> @@ -189,7 +189,11 @@ InitializeFvAndVariableStoreHeaders ( >> // VARIABLE_STORE_HEADER >> // >> VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)Headers + (UINTN)FirmwareVolumeHeader->HeaderLength); >> - CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid); >> + if (PcdGetBool (PcdIsSecureBoot)) { >> + CopyGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid); >> + } else { >> + CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid); >> + } >> VariableStoreHeader->Size = PcdGet32(PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength; >> VariableStoreHeader->Format = VARIABLE_STORE_FORMATTED; >> VariableStoreHeader->State = VARIABLE_STORE_HEALTHY; >> @@ -220,6 +224,7 @@ ValidateFvHeader ( >> VARIABLE_STORE_HEADER* VariableStoreHeader; >> UINTN VariableStoreLength; >> UINTN FvLength; >> + EFI_GUID *Guid; >> >> FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress; >> >> @@ -258,7 +263,12 @@ ValidateFvHeader ( >> VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)FwVolHeader + (UINTN)FwVolHeader->HeaderLength); >> >> // Check the Variable Store Guid >> - if ( CompareGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid) == FALSE ) >> + if (PcdGetBool (PcdIsSecureBoot)) { >> + Guid = &gEfiAuthenticatedVariableGuid; >> + } else { >> + Guid = &gEfiVariableGuid; >> + } >> + if (CompareGuid (&VariableStoreHeader->Signature, Guid) == FALSE) >> { >> DEBUG ((EFI_D_ERROR, "ValidateFvHeader: Variable Store Guid non-compatible\n")); >> return EFI_NOT_FOUND; >> -- >> 2.9.5 >>