1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Fix invalid attribute combination

xianhui liu posted 1 patch 4 years, 7 months ago
Failed in applying to current master (apply log)
.../BlackBoxTest/AuthVariableServicesBBTestConformance.c            | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
[edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Fix invalid attribute combination
Posted by xianhui liu 4 years, 7 months ago 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1942
avoid using EFI_VARIABLE_RUNTIME_ACCESS without
EFI_VARIABLE_BOOTSERVICE_ACCESS in AttrArray.

Cc: Oleksiy <oleksiyy@ami.com>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Signed-off-by: xianhui liu <xianhuix.liu@intel.com>
---
 .../BlackBoxTest/AuthVariableServicesBBTestConformance.c            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
index a1d1c4c3..23b00e35 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
@@ -1,7 +1,7 @@
 /** @file
 
   Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -160,19 +160,16 @@ AuthVariableDERConfTest (
     //  For 1 attribute.
     //
     EFI_VARIABLE_NON_VOLATILE,
-    EFI_VARIABLE_RUNTIME_ACCESS,
     EFI_VARIABLE_BOOTSERVICE_ACCESS,
     EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     //
     //  For 2 attributes.
     //
-    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-    EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
@@ -180,7 +177,6 @@ AuthVariableDERConfTest (
     //  For 3 attributes.
     //
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
     EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
-- 
2.14.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47462): https://edk2.groups.io/g/devel/message/47462
Mute This Topic: https://groups.io/mt/34185463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Fix invalid attribute combination
Posted by Eric Jin 4 years, 7 months ago 
Reviewed-by: Eric Jin <eric.jin@intel.com>

-----Original Message-----
From: Liu, XianhuiX <xianhuix.liu@intel.com> 
Sent: Wednesday, September 18, 2019 10:38 AM
To: devel@edk2.groups.io
Cc: Oleksiy <oleksiyy@ami.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Jin, Eric <eric.jin@intel.com>
Subject: [edk2-test][Patch] uefi-sct/SctPkg: Fix invalid attribute combination

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1942
avoid using EFI_VARIABLE_RUNTIME_ACCESS without EFI_VARIABLE_BOOTSERVICE_ACCESS in AttrArray.

Cc: Oleksiy <oleksiyy@ami.com>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Signed-off-by: xianhui liu <xianhuix.liu@intel.com>
---
 .../BlackBoxTest/AuthVariableServicesBBTestConformance.c            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
index a1d1c4c3..23b00e35 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices
+++ /BlackBoxTest/AuthVariableServicesBBTestConformance.c
@@ -1,7 +1,7 @@
 /** @file
 
   Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights 
+ reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License @@ -160,19 +160,16 @@ AuthVariableDERConfTest (
     //  For 1 attribute.
     //
     EFI_VARIABLE_NON_VOLATILE,
-    EFI_VARIABLE_RUNTIME_ACCESS,
     EFI_VARIABLE_BOOTSERVICE_ACCESS,
     EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     //
     //  For 2 attributes.
     //
-    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-    EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
     EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
@@ -180,7 +177,6 @@ AuthVariableDERConfTest (
     //  For 3 attributes.
     //
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
     EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS,
 
--
2.14.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47691): https://edk2.groups.io/g/devel/message/47691
Mute This Topic: https://groups.io/mt/34185463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.