[edk2-devel] [PATCH 1/1] SecurityPkg: Fix SecureBootDefaultKeysDxe failed to start

[Yao, Jiewen]

Pushed 22737996771c8053189b8fe2839cf4a96272784a

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Yao, Jiewen
> Sent: Thursday, September 30, 2021 10:32 PM
> To: devel at edk2.groups.io; gjb at semihalf.com; nhi at os.amperecomputing.com
> Cc: patches at amperecomputing.com; Wang, Jian J <jian.j.wang at intel.com>
> Subject: Re: [edk2-devel] [PATCH 1/1] SecurityPkg: Fix
> SecureBootDefaultKeysDxe failed to start
> 
> Acked-by: Jiewen Yao <Jiewen.yao at intel.com>
> 
> 
> > -----Original Message-----
> > From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Grzegorz
> > Bernacki
> > Sent: Wednesday, September 29, 2021 4:36 PM
> > To: edk2-devel-groups-io <devel at edk2.groups.io>;
> > nhi at os.amperecomputing.com
> > Cc: patches at amperecomputing.com; Yao, Jiewen <jiewen.yao at intel.com>;
> > Wang, Jian J <jian.j.wang at intel.com>
> > Subject: Re: [edk2-devel] [PATCH 1/1] SecurityPkg: Fix
> > SecureBootDefaultKeysDxe failed to start
> >
> > Hi,
> >
> > Looks good to me...
> > Reviewed-by: Grzegorz Bernacki <gjb at semihalf.com>
> >
> > pon., 27 wrz 2021 o 09:48 Nhi Pham via groups.io
> > <nhi=os.amperecomputing.com at groups.io> napisał(a):
> > >
> > > The dbt and dbx keys are optional, the driver entry should return
> > > EFI_SUCCESS to start if they are not found in the firmware flash. This
> > > patch is to fix it and update the description of retval as well.
> > >
> > > Cc: Jiewen Yao <jiewen.yao at intel.com>
> > > Cc: Jian J Wang <jian.j.wang at intel.com>
> > > Cc: Grzegorz Bernacki <gjb at semihalf.com>
> > > Signed-off-by: Nhi Pham <nhi at os.amperecomputing.com>
> > > ---
> > >
> >
> SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefa
> > ultKeysDxe.c | 21 +++++++++++++-------
> > >  1 file changed, 14 insertions(+), 7 deletions(-)
> > >
> > > diff --git
> >
> a/SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootD
> > efaultKeysDxe.c
> >
> b/SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootD
> > efaultKeysDxe.c
> > > index f51d5243b7e8..10bdb1b58e6f 100644
> > > ---
> >
> a/SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootD
> > efaultKeysDxe.c
> > > +++
> >
> b/SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootD
> > efaultKeysDxe.c
> > > @@ -3,6 +3,7 @@
> > >
> > >  Copyright (c) 2021, ARM Ltd. All rights reserved.<BR>
> > >  Copyright (c) 2021, Semihalf All rights reserved.<BR>
> > > +Copyright (c) 2021, Ampere Computing LLC. All rights reserved.<BR>
> > >  SPDX-License-Identifier: BSD-2-Clause-Patent
> > >
> > >  **/
> > > @@ -23,10 +24,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> > >    @param[in]  ImageHandle        The image handle of the driver.
> > >    @param[in]  SystemTable        The system table.
> > >
> > > -  @retval EFI_ALREADY_STARTED    The driver already exists in system.
> > > -  @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack
> of
> > resources.
> > > -  @retval EFI_SUCCESS            All the related protocols are installed on the
> > driver.
> > > -  @retval Others                 Fail to get the SecureBootEnable variable.
> > > +  @retval EFI_SUCCESS            The secure default keys are initialized
> > successfully.
> > > +  @retval EFI_UNSUPPORTED        One of the secure default keys already
> > exists.
> > > +  @retval EFI_NOT_FOUND          One of the PK, KEK, or DB default keys is
> not
> > found.
> > > +  @retval Others                 Fail to initialize the secure default keys.
> > >
> > >  **/
> > >  EFI_STATUS
> > > @@ -56,14 +57,20 @@ SecureBootDefaultKeysEntryPoint (
> > >    }
> > >
> > >    Status = SecureBootInitDbtDefault ();
> > > -  if (EFI_ERROR (Status)) {
> > > +  if (Status == EFI_NOT_FOUND) {
> > >      DEBUG ((DEBUG_INFO, "%a: dbtDefault not initialized\n",
> __FUNCTION__));
> > > +  } else if (EFI_ERROR (Status)) {
> > > +    DEBUG ((DEBUG_ERROR, "%a: Cannot initialize dbtDefault: %r\n",
> > __FUNCTION__, Status));
> > > +    return Status;
> > >    }
> > >
> > >    Status = SecureBootInitDbxDefault ();
> > > -  if (EFI_ERROR (Status)) {
> > > +  if (Status == EFI_NOT_FOUND) {
> > >      DEBUG ((DEBUG_INFO, "%a: dbxDefault not initialized\n",
> __FUNCTION__));
> > > +  } else if (EFI_ERROR (Status)) {
> > > +    DEBUG ((DEBUG_ERROR, "%a: Cannot initialize dbxDefault: %r\n",
> > __FUNCTION__, Status));
> > > +    return Status;
> > >    }
> > >
> > > -  return Status;
> > > +  return EFI_SUCCESS;
> > >  }
> > > --
> > > 2.17.1
> > >
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81337): https://edk2.groups.io/g/devel/message/81337
Mute This Topic: https://groups.io/mt/85895399/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-