Create PR https://github.com/tianocore/edk2/pull/4045 to merge it.
Thanks Liming > -----邮件原件----- > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sunny Wang > 发送时间: 2023年2月13日 18:43 > 收件人: Stuart Yoder <stuart.yo...@arm.com>; devel@edk2.groups.io > 抄送: gaolim...@byosoft.com.cn; hao.a...@intel.com; Sunny Wang > <sunny.w...@arm.com> > 主题: Re: [edk2-devel] [PATCH] MdeModulePkg/Variable: Attribute > combination should return EFI_UNSUPPORTED > > Looks good to me. Thanks, Stuart. > Reviewed-by: Sunny Wang <sunny.w...@arm.com> > > -----Original Message----- > From: Stuart Yoder <stuart.yo...@arm.com> > Sent: 09 February 2023 22:31 > To: devel@edk2.groups.io > Cc: gaolim...@byosoft.com.cn; hao.a...@intel.com; Sunny Wang > <sunny.w...@arm.com> > Subject: [PATCH] MdeModulePkg/Variable: Attribute combination should > return EFI_UNSUPPORTED > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4341 > > Commit 21320ef66989 broke some tests in the AuthVar_Conf test > in edk2-test. There are 2 testcases that invoke SetVariable > with the following attribute value: > > (EFI_VARIABLE_NON_VOLATILE | > EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) > > EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and the UEFI > spec > says this should return EFI_UNSUPPORTED. > > Cc: Liming Gao <gaolim...@byosoft.com.cn> > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Sunny Wang <sunny.w...@arm.com> > > Signed-off-by: Stuart Yoder <stuart.yo...@arm.com> > --- > MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > index 6c1a3440ac..14c176887a 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > @@ -2676,7 +2676,11 @@ VariableServiceSetVariable ( > // > > // Only EFI_VARIABLE_NON_VOLATILE attribute is invalid > > // > > - return EFI_INVALID_PARAMETER; > > + if ((Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0) > { > > + return EFI_UNSUPPORTED; > > + } else { > > + return EFI_INVALID_PARAMETER; > > + } > > } else if ((Attributes & VARIABLE_ATTRIBUTE_AT_AW) != 0) { > > if (!mVariableModuleGlobal->VariableGlobal.AuthSupport) { > > // > > -- > 2.34.1 > > 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 (#100213): https://edk2.groups.io/g/devel/message/100213 Mute This Topic: https://groups.io/mt/96976734/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
