arm-bsp/trusted-services: smm gateway fixes for
cover arm-bsp/trusted-services: smm gateway fixes for
From: Emekcan <[email protected]>
The SMM gateway in trusted-services does not return the right error values in negative cases. This patchset fixes those issues as expected in EDK2-tests.
Emekcan (2):
arm-bsp/trusted-services: add checks for null attributes in smm
gateway
arm-bsp/trusted-services: Fix GetNextVariable max_name_len in smm
gateway
...teway-add-checks-for-null-attributes.patch | 35 +++++++++++++++++++ .../0022-GetNextVariableName-Fix.patch | 33 +++++++++++++++++ .../trusted-services/ts-corstone1000.inc | 2 ++ 3 files changed, 70 insertions(+) create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-smm_gateway-add-checks-for-null-attributes.patch create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0022-GetNextVariableName-Fix.patch
Signature · 1 line
2.17.1
PATCH 1/2 arm-bsp/trusted-services: add checks for null attributes in smm gateway
From: Emekcan <[email protected]>
As in EDK-2 and EDK-2 test code, setVariable() with 0 attributes means a delete variable requiest. Currently, smm gateway doesn't handle this scenario. This commit adds that support
--- ...teway-add-checks-for-null-attributes.patch | 35 +++++++++++++++++++ .../trusted-services/ts-corstone1000.inc | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-smm_gateway-add-checks-for-null-attributes.patch
meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-smm_gateway-add-checks-for-null-attributes.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 6d3cac6f3a6e977e9330c9c06514a372ade170a2 Mon Sep 17 00:00:00 2001 +From: Emekcan <[email protected]> +Date: Wed, 2 Nov 2022 09:58:27 +0000 +Subject: [PATCH] smm_gateway: add checks for null attributes + +As par EDK-2 and EDK-2 test code, setVariable() with 0 +attributes means a delete variable request. Currently, +smm gatway doesn't handle this scenario. This commit adds +that support. + +Upstream-Status: Pending +Signed-off-by: Emekcan Aras <[email protected]> +--- + components/service/smm_variable/backend/uefi_variable_store.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c +index 6c3b9ed8..a691dc5d 100644 +--- a/components/service/smm_variable/backend/uefi_variable_store.c ++++ b/components/service/smm_variable/backend/uefi_variable_store.c +@@ -202,9 +202,9 @@ efi_status_t uefi_variable_store_set_variable( + if (info->is_variable_set) { + + /* It's a request to update to an existing variable */ +- if (!(var->Attributes & ++ if (!(var->Attributes) || (!(var->Attributes & + (EFI_VARIABLE_APPEND_WRITE | EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS_MASK)) && +- !var->DataSize) { ++ !var->DataSize)) { + + /* It's a remove operation - for a remove, the variable + * data must be removed from the storage backend before +-- +2.17.1 +
meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc +1 -0
@@ -21,4 +21,5 @@ SRC_URI:append:corstone1000 = " \ file://0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch;patchdir=../trusted-services \ file://0019-plat-corstone1000-change-default-smm-values.patch;patchdir=../trusted-services \ file://0020-FMP-Support-in-Corstone1000.patch;patchdir=../trusted-services \ + file://0021-smm_gateway-add-checks-for-null-attributes.patch;patchdir=../trusted-services \ "
Signature · 1 line
2.17.1
PATCH 2/2 arm-bsp/trusted-services: Fix GetNextVariable max_name_len in smm gateway
In reply to [email protected]From: Emekcan <[email protected]>
GetNextVariableName() should return EFI_BUFFER_TOO_SMALL when NameSize is smaller than the actual NameSize. It currently returns EFI_BUFFER_OUT_OF_RESOURCES due to setting max_name_len incorrectly. This fixes max_name_len error by replacing it with actual NameSize request by u-boot.
--- .../0022-GetNextVariableName-Fix.patch | 33 +++++++++++++++++++ .../trusted-services/ts-corstone1000.inc | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0022-GetNextVariableName-Fix.patch
meta-arm-bsp/recipes-security/trusted-services/corstone1000/0022-GetNextVariableName-Fix.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 2aa665ad2cb13bc79b645db41686449a47593aab Mon Sep 17 00:00:00 2001 +From: Emekcan <[email protected]> +Date: Thu, 3 Nov 2022 17:43:40 +0000 +Subject: [PATCH] smm_gateway: GetNextVariableName Fix + +GetNextVariableName() should return EFI_BUFFER_TOO_SMALL +when NameSize is smaller than the actual NameSize. It +currently returns EFI_BUFFER_OUT_OF_RESOURCES due to setting +max_name_len incorrectly. This fixes max_name_len error by +replacing it with actual NameSize request by u-boot. + +Upstream-Status: Pending +Signed-off-by: Emekcan Aras <[email protected]> +--- + .../service/smm_variable/provider/smm_variable_provider.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/service/smm_variable/provider/smm_variable_provider.c b/components/service/smm_variable/provider/smm_variable_provider.c +index a9679b7e..6a4b6fa7 100644 +--- a/components/service/smm_variable/provider/smm_variable_provider.c ++++ b/components/service/smm_variable/provider/smm_variable_provider.c +@@ -197,7 +197,7 @@ static rpc_status_t get_next_variable_name_handler(void *context, struct call_re + efi_status = uefi_variable_store_get_next_variable_name( + &this_instance->variable_store, + (SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME*)resp_buf->data, +- max_name_len, ++ ((SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME*)resp_buf->data)->NameSize, + &resp_buf->data_len); + } + else { +-- +2.17.1 +
meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc +1 -0
@@ -22,4 +22,5 @@ SRC_URI:append:corstone1000 = " \ file://0019-plat-corstone1000-change-default-smm-values.patch;patchdir=../trusted-services \ file://0020-FMP-Support-in-Corstone1000.patch;patchdir=../trusted-services \ file://0021-smm_gateway-add-checks-for-null-attributes.patch;patchdir=../trusted-services \ + file://0022-GetNextVariableName-Fix.patch;patchdir=../trusted-services \ "
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 11 lines · On Fri, 4 Nov 2022 15:04:47 +0000, [email protected] wrote:
The SMM gateway in trusted-services does not return the right error values in negative cases. This patchset fixes those issues as expected in EDK2-tests.
Emekcan (2):
arm-bsp/trusted-services: add checks for null attributes in smm
gateway
arm-bsp/trusted-services: Fix GetNextVariablemax_name_lenin smm
gateway[...]
Applied, thanks!
[1/2] arm-bsp/trusted-services: add checks for null attributes in smm gateway
commit: 5fd87e47f6d6ef4949123a2b21a6a4217b84ecc2
[2/2] arm-bsp/trusted-services: Fix GetNextVariable max_name_len in smm gateway
commit: a41572a03284c13c31c612bc04eb6c34bdf9f03dBest regards,
Signature · 1 line
Jon Mason <[email protected]>