.../Universal/Variable/RuntimeDxe/Variable.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
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 <gaoliming@byosoft.com.cn>
Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Cc: G Edhaya Chandran <edhaya.chandran@arm.com>
Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
Signed-off-by: Sunny Wang <sunny.wang@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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <gaoliming@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.Wang@arm.com>; Liming Gao > <gaoliming@byosoft.com.cn>; Heinrich Schuchardt > <heinrich.schuchardt@canonical.com>; G Edhaya Chandran > <edhaya.chandran@arm.com>; Samer El-Haj-Mahmoud > <samer.el-haj-mahmoud@arm.com>; Sunny Wang <sunny.wang@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 <gaoliming@byosoft.com.cn> > Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > Cc: G Edhaya Chandran <edhaya.chandran@arm.com> > Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com> > > Signed-off-by: Sunny Wang <sunny.wang@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+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub > [gaoliming@byosoft.com.cn] > -=-=-=-=-=-= > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85581): https://edk2.groups.io/g/devel/message/85581 Mute This Topic: https://groups.io/mt/88363925/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.