Thanks, Liming. -----Original Message----- From: gaoliming <gaolim...@byosoft.com.cn> Sent: 18 January 2022 05:25 To: devel@edk2.groups.io; gaolim...@byosoft.com.cn; Sunny Wang <sunny.w...@arm.com> Cc: 'Heinrich Schuchardt' <heinrich.schucha...@canonical.com>; G Edhaya Chandran <edhaya.chand...@arm.com>; Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com> Subject: 回复: [edk2-devel] [PATCH] MdeModulePkg/Variable: Make only EFI_VARIABLE_NON_VOLATILE invalid
Create https://github.com/tianocore/edk2/pull/2418 to merge it. Thanks Liming > -----邮件原件----- > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming > 发送时间: 2022年1月12日 9:07 > 收件人: devel@edk2.groups.io; sunny.w...@arm.com > 抄送: 'Heinrich Schuchardt' <heinrich.schucha...@canonical.com>; 'G Edhaya > Chandran' <edhaya.chand...@arm.com>; 'Samer El-Haj-Mahmoud' > <samer.el-haj-mahm...@arm.com> > 主题: 回复: [edk2-devel] [PATCH] MdeModulePkg/Variable: Make only > EFI_VARIABLE_NON_VOLATILE invalid > > Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn> > > > -----邮件原件----- > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sunny > Wang > > 发送时间: 2022年1月12日 5:37 > > 收件人: devel@edk2.groups.io > > 抄送: Sunny Wang <sunny.w...@arm.com>; Liming Gao > > <gaolim...@byosoft.com.cn>; Heinrich Schuchardt > > <heinrich.schucha...@canonical.com>; G Edhaya Chandran > > <edhaya.chand...@arm.com>; Samer El-Haj-Mahmoud > > <samer.el-haj-mahm...@arm.com>; Sunny Wang > <sunny.w...@arm.com> > > 主题: [edk2-devel] [PATCH] MdeModulePkg/Variable: Make only > > EFI_VARIABLE_NON_VOLATILE invalid > > > > Only EFI_VARIABLE_NON_VOLATILE attribute is an invalid combination > > of attribute bits, so update the variable driver to return > > EFI_INVALID_PARAMETER so that we can prevent the invalid variable > > being created. > > > > This change also fixes the SCT failure below: > > - RT.QueryVariableInfo - With being an invalid combination -- FAILURE > > > > For details, please check the threads below: > > - https://edk2.groups.io/g/devel/topic/86486174 > > - https://edk2.groups.io/g/devel/message/82466 > > > > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Cc: Heinrich Schuchardt <heinrich.schucha...@canonical.com> > > Cc: G Edhaya Chandran <edhaya.chand...@arm.com> > > Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com> > > > > Signed-off-by: Sunny Wang <sunny.w...@arm.com> > > --- > > .../Universal/Variable/RuntimeDxe/Variable.c | 16 > +++++++++++++++- > > 1 file changed, 15 insertions(+), 1 deletion(-) > > > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > > b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > > index 9722a94420..6c1a3440ac 100644 > > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > > @@ -19,6 +19,7 @@ > > Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > > (C) Copyright 2015-2018 Hewlett Packard Enterprise Development > LP<BR> > > Copyright (c) Microsoft Corporation.<BR> > > +Copyright (c) 2022, ARM Limited. All rights reserved.<BR> > > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > @@ -2660,14 +2661,22 @@ VariableServiceSetVariable ( > > } > > > > // > > - // Make sure if runtime bit is set, boot service bit is set also. > > + // Check if the combination of attribute bits is valid. > > // > > if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | > > EFI_VARIABLE_BOOTSERVICE_ACCESS)) == > EFI_VARIABLE_RUNTIME_ACCESS) > > { > > + // > > + // Make sure if runtime bit is set, boot service bit is set also. > > + // > > if ((Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != > 0) > > { > > return EFI_UNSUPPORTED; > > } else { > > return EFI_INVALID_PARAMETER; > > } > > + } else if ((Attributes & EFI_VARIABLE_ATTRIBUTES_MASK) == > > EFI_VARIABLE_NON_VOLATILE) { > > + // > > + // Only EFI_VARIABLE_NON_VOLATILE attribute is invalid > > + // > > + return EFI_INVALID_PARAMETER; > > } else if ((Attributes & VARIABLE_ATTRIBUTE_AT_AW) != 0) { > > if (!mVariableModuleGlobal->VariableGlobal.AuthSupport) { > > // > > @@ -3142,6 +3151,11 @@ VariableServiceQueryVariableInfo ( > > // Make sure the Attributes combination is supported by the > platform. > > // > > return EFI_UNSUPPORTED; > > + } else if ((Attributes & EFI_VARIABLE_ATTRIBUTES_MASK) == > > EFI_VARIABLE_NON_VOLATILE) { > > + // > > + // Only EFI_VARIABLE_NON_VOLATILE attribute is invalid > > + // > > + return EFI_INVALID_PARAMETER; > > } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | > > EFI_VARIABLE_BOOTSERVICE_ACCESS)) == > EFI_VARIABLE_RUNTIME_ACCESS) > > { > > // > > // Make sure if runtime bit is set, boot service bit is set also. > > -- > > 2.33.0.windows.2 > > > > > > > > -=-=-=-=-=-= > > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#85574): > https://edk2.groups.io/g/devel/message/85574 > > Mute This Topic: https://groups.io/mt/88359863/4905953 > > Group Owner: devel+ow...@edk2.groups.io > > Unsubscribe: https://edk2.groups.io/g/devel/unsub > > [gaolim...@byosoft.com.cn] > > -=-=-=-=-=-= > > > > > > > > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#86088): https://edk2.groups.io/g/devel/message/86088 Mute This Topic: https://groups.io/mt/88700330/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
