efi_loader: Improve the parameter check for QueryVariableInfo()
PATCH 1/1 efi_loader: Improve the parameter check for QueryVariableInfo()
Improve efi_query_variable_info() to check the parameter settings and return correct error code according to the UEFI spec 2.9.
--- lib/efi_loader/efi_var_common.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
lib/efi_loader/efi_var_common.c +19 -1
@@ -163,10 +163,28 @@ efi_status_t EFIAPI efi_query_variable_info(EFI_ENTRY ("%x %p %p %p" , attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size); - ret =efi_query_variable_info_int (attributes, +if (attributes ==0 || maximum_variable_storage_size ==NULL || + remaining_variable_storage_size ==NULL || + maximum_variable_size ==NULL ) +return EFI_EXIT (EFI_INVALID_PARAMETER ); + +if ((attributes & ~(u32 )EFI_VARIABLE_MASK ) || + (attributes &EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS ) || + (!IS_ENABLED (CONFIG_EFI_SECURE_BOOT ) && + (attributes &EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS ))) { + ret =EFI_UNSUPPORTED ; + }else if ((attributes & (EFI_VARIABLE_RUNTIME_ACCESS |EFI_VARIABLE_BOOTSERVICE_ACCESS )) ==EFI_VARIABLE_RUNTIME_ACCESS ) { +/* Runtime accessible variable must also be accessible in bootservices */ + ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ + ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size); + }return EFI_EXIT (ret); }
Quoted 2 lines · Masami Hiramatsu
Improve
efi_query_variable_info()to check the parameter settings and return correct error code according to the UEFI spec 2.9.
Detailed requirements can be found in the Self Certification Test (SCT) II Case Specification, June 2017, chapter 4.1.4 QueryVariableInfo().
I would prefer to add that reference.
Quoted 12 lines
Signed-off-by Masami Hiramatsu <[email protected]>Reported-by Kazuhiko Sakamoto <[email protected]>--- lib/efi_loader/efi_var_common.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)lib/efi_loader/efi_var_common.c +0
-0
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 169
Quoted 8 lines
lib/efi_loader/efi_var_common.c +4
-1@@ -163,10 +163,28 @@ efi_status_t EFIAPI efi_query_variable_info(EFI_ENTRY ("%x %p %p %p" , attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size); - ret = efi_query_variable_info_int(attributes, +if (attributes ==0 || maximum_variable_storage_size ==NULL || + remaining_variable_storage_size ==NULL || + maximum_variable_size ==NULL ) +return EFI_EXIT (EFI_INVALID_PARAMETER );
scripts/checkpatch.pl:
CHECK: Comparison to NULL could be written "!maximum_variable_storage_size" #26: FILE: lib/efi_loader/efi_var_common.c:166:
+ if (attributes == 0 || maximum_variable_storage_size == NULL ||
Also use !attributes instead of attributes == 0.
CHECK: Comparison to NULL could be written
"!remaining_variable_storage_size"
#27: FILE: lib/efi_loader/efi_var_common.c:167:
+ remaining_variable_storage_size == NULL ||
CHECK: Comparison to NULL could be written "!maximum_variable_size" #28: FILE: lib/efi_loader/efi_var_common.c:168:
+ maximum_variable_size == NULL)
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 177
Quoted 8 lines
lib/efi_loader/efi_var_common.c +8
-0+ +if ((attributes & ~(u32 )EFI_VARIABLE_MASK ) || + (attributes &EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS ) || + (!IS_ENABLED (CONFIG_EFI_SECURE_BOOT ) && + (attributes &EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS ))) { + ret =EFI_UNSUPPORTED ; + }else if ((attributes & (EFI_VARIABLE_RUNTIME_ACCESS |EFI_VARIABLE_BOOTSERVICE_ACCESS )) ==EFI_VARIABLE_RUNTIME_ACCESS ) { +/* Runtime accessible variable must also be accessible in bootservices */
Please, stick to 80 characters per line.
This does not catch attributes == EFI_VARIABLE_NON_VOLATILE where test case 5.2.1.4.5 requires EFI_INVALID_PARAMETER.
Shouldn't we check
!(attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS)
instead?
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 3 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */
We don't support EFI_VARIABLE_HARDWARE_ERROR_RECORD at all. So shouldn't flag EFI_VARIABLE_HARDWARE_ERROR_RECORD result in EFI_UNSUPPORTED?
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 6 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);
CHECK: Alignment should match open parenthesis
#44: FILE: lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,
Best regards
Heinrich
Quoted 5 lines
lib/efi_loader/efi_var_common.c +1
-0+ }return EFI_EXIT (ret); }
Hi Heinrich,
Thanks for the review!
2021年6月30日(水) 16:06 Heinrich Schuchardt <[email protected]>:
Quoted 7 lines · Masami Hiramatsu
Quoted 2 lines
Improve
efi_query_variable_info()to check the parameter settings and return correct error code according to the UEFI spec 2.9.Detailed requirements can be found in the Self Certification Test (SCT) II Case Specification, June 2017, chapter 4.1.4
QueryVariableInfo().
Yes, actually this was found by the SCT.
Quoted 2 lines
I would prefer to add that reference.
OK, I'll add it.
Quoted 24 lines
Quoted 13 lines
Signed-off-by Masami Hiramatsu <[email protected]>Reported-by Kazuhiko Sakamoto <[email protected]>--- lib/efi_loader/efi_var_common.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)lib/efi_loader/efi_var_common.c +0
-0lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 169
Quoted 8 lines
lib/efi_loader/efi_var_common.c +4
-1@@ -163,10 +163,28 @@ efi_status_t EFIAPI efi_query_variable_info(EFI_ENTRY ("%x %p %p %p" , attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size); - ret = efi_query_variable_info_int(attributes, +if (attributes ==0 || maximum_variable_storage_size ==NULL || + remaining_variable_storage_size ==NULL || + maximum_variable_size ==NULL ) +return EFI_EXIT (EFI_INVALID_PARAMETER );
scripts/checkpatch.pl:
Quoted 5 lines
CHECK: Comparison to NULL could be written "!maximum_variable_storage_size" #26: FILE:
lib/efi_loader/efi_var_common.c:166:
+ if (attributes == 0 ||maximum_variable_storage_size== NULL ||Also use !attributes instead of attributes == 0.
OK.
Quoted 19 lines
CHECK: Comparison to NULL could be written
"!remaining_variable_storage_size"
#27: FILE:lib/efi_loader/efi_var_common.c:167:
+remaining_variable_storage_size== NULL ||CHECK: Comparison to NULL could be written "!maximum_variable_size" #28: FILE:
lib/efi_loader/efi_var_common.c:168:
+maximum_variable_size== NULL)lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 177
Quoted 8 lines
lib/efi_loader/efi_var_common.c +8
-0+ +if ((attributes & ~(u32 )EFI_VARIABLE_MASK ) || + (attributes &EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS ) || + (!IS_ENABLED (CONFIG_EFI_SECURE_BOOT ) && + (attributes &EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS ))) { + ret =EFI_UNSUPPORTED ; + }else if ((attributes & (EFI_VARIABLE_RUNTIME_ACCESS |EFI_VARIABLE_BOOTSERVICE_ACCESS )) ==EFI_VARIABLE_RUNTIME_ACCESS ) { +/* Runtime accessible variable must also be accessible in bootservices */
Quoted 1 line
Please, stick to 80 characters per line.
OK.
Quoted 3 lines
This does not catch attributes ==
EFI_VARIABLE_NON_VOLATILEwhere test case 5.2.1.4.5 requiresEFI_INVALID_PARAMETER.
Hmm, but this could pass the SCT runtime test.
So attributes == EFI_VARIABLES_NON_VOLATILE should fail? Actually, I referred to the VariableServiceQueryVariableInfo()@EDK2 and UEFI spec,
and I couldn't see such conditions.
Quoted 6 lines
Shouldn't we check
!(attributes &
EFI_VARIABLE_BOOTSERVICE_ACCESS)instead?
Ah, right, because this function is only used for the bootservice. (I found that runtime service uses another function)
Quoted 7 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 4 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ We don't support
EFI_VARIABLE_HARDWARE_ERROR_RECORDat all. So shouldn't flagEFI_VARIABLE_HARDWARE_ERROR_RECORDresult inEFI_UNSUPPORTED?
OK, I'll do.
BTW, from the UEFI spec, EFI_VARIABLE_APPEND_WRITE should be ignored in the QueryVariableInfo because that flag is used for SetVariables (as overwrite flag).
Thus, if attributes == EFI_VARIABLE_APPEND_WRITE, should we return EFI_INVALID_PARAMETER?
Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 7 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);
Quoted 4 lines
CHECK: Alignment should match open parenthesis
#44: FILE:lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,
OK, let me fix that.
Thank you,
Quoted 11 lines
Best regards
Heinrich
Quoted 5 lines
lib/efi_loader/efi_var_common.c +1
-0+ }return EFI_EXIT (ret); }
--
Masami Hiramatsu
Quoted 76 lines · Masami Hiramatsu
Hi Heinrich,
Thanks for the review!
2021年6月30日(水) 16:06 Heinrich Schuchardt <[email protected]>:
Quoted 7 lines · Masami Hiramatsu
Quoted 2 lines
Improve
efi_query_variable_info()to check the parameter settings and return correct error code according to the UEFI spec 2.9.Detailed requirements can be found in the Self Certification Test (SCT) II Case Specification, June 2017, chapter 4.1.4
QueryVariableInfo().Yes, actually this was found by the SCT.
Quoted 2 lines
I would prefer to add that reference.
OK, I'll add it.
Quoted 24 lines
Quoted 13 lines
Signed-off-by Masami Hiramatsu <[email protected]>Reported-by Kazuhiko Sakamoto <[email protected]>--- lib/efi_loader/efi_var_common.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)lib/efi_loader/efi_var_common.c +0
-0lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 169
Quoted 8 lines
lib/efi_loader/efi_var_common.c +4
-1@@ -163,10 +163,28 @@ efi_status_t EFIAPI efi_query_variable_info(EFI_ENTRY ("%x %p %p %p" , attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size); - ret = efi_query_variable_info_int(attributes, +if (attributes ==0 || maximum_variable_storage_size ==NULL || + remaining_variable_storage_size ==NULL || + maximum_variable_size ==NULL ) +return EFI_EXIT (EFI_INVALID_PARAMETER );
scripts/checkpatch.pl:Quoted 5 lines
CHECK: Comparison to NULL could be written "!maximum_variable_storage_size" #26: FILE:
lib/efi_loader/efi_var_common.c:166:
+ if (attributes == 0 ||maximum_variable_storage_size== NULL ||Also use !attributes instead of attributes == 0.
OK.
Quoted 19 lines
CHECK: Comparison to NULL could be written
"!remaining_variable_storage_size"
#27: FILE:lib/efi_loader/efi_var_common.c:167:
+remaining_variable_storage_size== NULL ||CHECK: Comparison to NULL could be written "!maximum_variable_size" #28: FILE:
lib/efi_loader/efi_var_common.c:168:
+maximum_variable_size== NULL)lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 177
Quoted 8 lines
lib/efi_loader/efi_var_common.c +8
-0+ +if ((attributes & ~(u32 )EFI_VARIABLE_MASK ) || + (attributes &EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS ) || + (!IS_ENABLED (CONFIG_EFI_SECURE_BOOT ) && + (attributes &EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS ))) { + ret =EFI_UNSUPPORTED ; + }else if ((attributes & (EFI_VARIABLE_RUNTIME_ACCESS |EFI_VARIABLE_BOOTSERVICE_ACCESS )) ==EFI_VARIABLE_RUNTIME_ACCESS ) { +/* Runtime accessible variable must also be accessible in bootservices */ Quoted 1 line
Please, stick to 80 characters per line.
OK.
Quoted 1 line
Quoted 8 lines
Quoted 2 lines
This does not catch attributes ==
EFI_VARIABLE_NON_VOLATILEwhere test case 5.2.1.4.5 requiresEFI_INVALID_PARAMETER.Hmm, but this could pass the SCT runtime test.
So attributes ==EFI_VARIABLES_NON_VOLATILEshould fail? Actually, I referred to the VariableServiceQueryVariableInfo()@EDK2 and UEFI spec,
and I couldn't see such conditions.
The SCT specification requires in 5.2.1.4.5.:
"1. Call QueryVariableInfoservice with the Attributes:
* EFI_VARIABLE_NON_VOLATILE
* EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESS
The returned code must be EFI_INVALID_PARAMETER."
See patch
[PATCH edk2-test 1/1] uefi-sct/SctPkg: uefi-sct:QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE)
https://edk2.groups.io/g/devel/message/77367
Quoted 10 lines
Quoted 7 lines
Shouldn't we check
!(attributes &
EFI_VARIABLE_BOOTSERVICE_ACCESS)instead?
Ah, right, because this function is only used for the bootservice. (I found that runtime service uses another function)
A variable without EFI_VARIABLE_BOOTSERVICE_ACCESS could neither be accessed before nor after ExitBootServices(). So this has to be invalid.
Best regards
Heinrich
Quoted 50 lines
Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 5 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ We don't support
EFI_VARIABLE_HARDWARE_ERROR_RECORDat all. So shouldn't flagEFI_VARIABLE_HARDWARE_ERROR_RECORDresult inEFI_UNSUPPORTED?OK, I'll do.
BTW, from the UEFI spec,
EFI_VARIABLE_APPEND_WRITEshould be ignored in the QueryVariableInfo because that flag is used for SetVariables (as overwrite flag).
Thus, if attributes ==EFI_VARIABLE_APPEND_WRITE, should we returnEFI_INVALID_PARAMETER?Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 7 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);Quoted 4 lines
CHECK: Alignment should match open parenthesis
#44: FILE:lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,OK, let me fix that.
Thank you,
Quoted 11 lines
Best regards
Heinrich
Quoted 5 lines
lib/efi_loader/efi_var_common.c +1
-0+ }return EFI_EXIT (ret); }--
Masami Hiramatsu
Hi Heinrich,
2021年6月30日(水) 23:55 Heinrich Schuchardt <[email protected]>:
Quoted 11 lines
Quoted 8 lines
Quoted 2 lines
This does not catch attributes ==
EFI_VARIABLE_NON_VOLATILEwhere test case 5.2.1.4.5 requiresEFI_INVALID_PARAMETER.Hmm, but this could pass the SCT runtime test.
So attributes ==EFI_VARIABLES_NON_VOLATILEshould fail? Actually, I referred to the VariableServiceQueryVariableInfo()@EDK2 and UEFI spec,
and I couldn't see such conditions.The SCT specification requires in 5.2.1.4.5.:
Quoted 7 lines
"1. Call QueryVariableInfoservice with the Attributes:
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESSThe returned code must be
EFI_INVALID_PARAMETER."
Ah, I see. so either NON_VOLATILE and RUNTIME_ACCESS must be used with BOOTSERVICE_ACCESS.
Quoted 13 lines
See patch
[PATCH edk2-test 1/1] uefi-sct/SctPkg: uefi-sct:
QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE)
https://edk2.groups.io/g/devel/message/77367Quoted 6 lines
Quoted 6 lines
Shouldn't we check
!(attributes &
EFI_VARIABLE_BOOTSERVICE_ACCESS)
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
instead?
Ah, right, because this function is only used for the bootservice. (I found that runtime service uses another function)
A variable without
EFI_VARIABLE_BOOTSERVICE_ACCESScould neither be accessed before nor afterExitBootServices(). So this has to be invalid.
OK, so BOOTSERVICE_ACCESS is required.
Hmm, but in that case, if we confirm BOOTSERVICE_ACCESS bit is set, should we still need to check NON_VOLATILE and RUNTIME_ACCESS?
I mean
if (!(attr & BOOTSERVICE_ACCESS))
return INVALID_PARAM;
else if (...) /* at this point, attr must have the BOOTSERVICE_ACCESS */
Thus, attributes shouldn't be equal to any of;
Quoted 3 lines
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESS
So, I think we only need
" !(attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS) " this check.
Best regards,
Quoted 56 lines
Best regards
Heinrich
Quoted 50 lines
Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 5 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ We don't support
EFI_VARIABLE_HARDWARE_ERROR_RECORDat all. So shouldn't flagEFI_VARIABLE_HARDWARE_ERROR_RECORDresult inEFI_UNSUPPORTED?OK, I'll do.
BTW, from the UEFI spec,
EFI_VARIABLE_APPEND_WRITEshould be ignored in the QueryVariableInfo because that flag is used for SetVariables (as overwrite flag).
Thus, if attributes ==EFI_VARIABLE_APPEND_WRITE, should we returnEFI_INVALID_PARAMETER?Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 7 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);Quoted 4 lines
CHECK: Alignment should match open parenthesis
#44: FILE:lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,OK, let me fix that.
Thank you,
Quoted 11 lines
Best regards
Heinrich
Quoted 5 lines
+ }
return EFI_EXIT(ret);}
--
Masami Hiramatsu
Signature · 1 line
Masami Hiramatsu
Quoted 59 lines · Masami Hiramatsu
Hi Heinrich,
2021年6月30日(水) 23:55 Heinrich Schuchardt <[email protected]>:
Quoted 11 lines
Quoted 8 lines
Quoted 2 lines
This does not catch attributes ==
EFI_VARIABLE_NON_VOLATILEwhere test case 5.2.1.4.5 requiresEFI_INVALID_PARAMETER.Hmm, but this could pass the SCT runtime test.
So attributes ==EFI_VARIABLES_NON_VOLATILEshould fail? Actually, I referred to the VariableServiceQueryVariableInfo()@EDK2 and UEFI spec,
and I couldn't see such conditions.The SCT specification requires in 5.2.1.4.5.:
Quoted 7 lines
"1. Call QueryVariableInfoservice with the Attributes:
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESSThe returned code must be
EFI_INVALID_PARAMETER."Ah, I see. so either
NON_VOLATILEandRUNTIME_ACCESSmust be used withBOOTSERVICE_ACCESS.Quoted 13 lines
See patch
[PATCH edk2-test 1/1] uefi-sct/SctPkg: uefi-sct:
QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE)
https://edk2.groups.io/g/devel/message/77367Quoted 6 lines
Quoted 6 lines
Shouldn't we check
!(attributes &
EFI_VARIABLE_BOOTSERVICE_ACCESS)Quoted 7 lines
Quoted 4 lines
Quoted 1 line
instead?
Ah, right, because this function is only used for the bootservice. (I found that runtime service uses another function)
A variable without
EFI_VARIABLE_BOOTSERVICE_ACCESScould neither be accessed before nor afterExitBootServices(). So this has to be invalid.OK, so
BOOTSERVICE_ACCESSis required.
Hmm, but in that case, if we confirmBOOTSERVICE_ACCESSbit is set, should we still need to checkNON_VOLATILEandRUNTIME_ACCESS?I mean
if (!(attr &
BOOTSERVICE_ACCESS))return INVALID_PARAM;else if (...) /* at this point, attr must have the
BOOTSERVICE_ACCESS*/Thus, attributes shouldn't be equal to any of;
Quoted 7 lines
Quoted 3 lines
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESSSo, I think we only need
" !(attributes &EFI_VARIABLE_BOOTSERVICE_ACCESS)" this check.
That is why I proposed this line. It covers all three test cases.
Best regards
Heinrich
Quoted 54 lines
Quoted 52 lines
Quoted 51 lines
Quoted 9 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 6 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ We don't support
EFI_VARIABLE_HARDWARE_ERROR_RECORDat all. So shouldn't flagEFI_VARIABLE_HARDWARE_ERROR_RECORDresult inEFI_UNSUPPORTED?OK, I'll do.
BTW, from the UEFI spec,
EFI_VARIABLE_APPEND_WRITEshould be ignored in the QueryVariableInfo because that flag is used for SetVariables (as overwrite flag).
Thus, if attributes ==EFI_VARIABLE_APPEND_WRITE, should we returnEFI_INVALID_PARAMETER?Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 7 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);Quoted 4 lines
CHECK: Alignment should match open parenthesis
#44: FILE:lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,OK, let me fix that.
Thank you,
Quoted 11 lines
Best regards
Heinrich
Quoted 5 lines
+ }
return EFI_EXIT(ret); }--
Masami Hiramatsu
2021年7月1日(木) 0:30 Heinrich Schuchardt <[email protected]>:
Quoted 65 lines · Masami Hiramatsu
Quoted 63 lines
Hi Heinrich,
2021年6月30日(水) 23:55 Heinrich Schuchardt <[email protected]>:
Quoted 11 lines
Quoted 8 lines
Quoted 2 lines
This does not catch attributes ==
EFI_VARIABLE_NON_VOLATILEwhere test case 5.2.1.4.5 requiresEFI_INVALID_PARAMETER.Hmm, but this could pass the SCT runtime test.
So attributes ==EFI_VARIABLES_NON_VOLATILEshould fail? Actually, I referred to the VariableServiceQueryVariableInfo()@EDK2 and UEFI spec,
and I couldn't see such conditions.The SCT specification requires in 5.2.1.4.5.:
Quoted 7 lines
"1. Call QueryVariableInfoservice with the Attributes:
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESSThe returned code must be
EFI_INVALID_PARAMETER."Ah, I see. so either
NON_VOLATILEandRUNTIME_ACCESSmust be used withBOOTSERVICE_ACCESS.Quoted 13 lines
See patch
[PATCH edk2-test 1/1] uefi-sct/SctPkg: uefi-sct:
QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE)
https://edk2.groups.io/g/devel/message/77367Quoted 6 lines
Quoted 6 lines
Shouldn't we check
!(attributes &
EFI_VARIABLE_BOOTSERVICE_ACCESS)Quoted 7 lines
Quoted 4 lines
Quoted 1 line
instead?
Ah, right, because this function is only used for the bootservice. (I found that runtime service uses another function)
A variable without
EFI_VARIABLE_BOOTSERVICE_ACCESScould neither be accessed before nor afterExitBootServices(). So this has to be invalid.OK, so
BOOTSERVICE_ACCESSis required.
Hmm, but in that case, if we confirmBOOTSERVICE_ACCESSbit is set, should we still need to checkNON_VOLATILEandRUNTIME_ACCESS?I mean
if (!(attr &
BOOTSERVICE_ACCESS))return INVALID_PARAM;else if (...) /* at this point, attr must have the
BOOTSERVICE_ACCESS*/Thus, attributes shouldn't be equal to any of;
Quoted 3 lines
*
EFI_VARIABLE_NON_VOLATILE
*EFI_VARIABLE_RUNTIME_ACCESS
* EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESS
Quoted 5 lines
Quoted 3 lines
So, I think we only need
" !(attributes &EFI_VARIABLE_BOOTSERVICE_ACCESS)" this check.That is why I proposed this line. It covers all three test cases.
Ah, thanks for the confirmation. OK, I'll fix with it.
Best regards,
Quoted 60 lines
Best regards
Heinrich
Quoted 54 lines
Quoted 52 lines
Quoted 51 lines
Quoted 9 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 180
Quoted 6 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else if ((attributes & (EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_HARDWARE_ERROR_RECORD )) ==EFI_VARIABLE_HARDWARE_ERROR_RECORD ) { +/* HW error occurs only on non-volatile variables */ We don't support
EFI_VARIABLE_HARDWARE_ERROR_RECORDat all. So shouldn't flagEFI_VARIABLE_HARDWARE_ERROR_RECORDresult inEFI_UNSUPPORTED?OK, I'll do.
BTW, from the UEFI spec,
EFI_VARIABLE_APPEND_WRITEshould be ignored in the QueryVariableInfo because that flag is used for SetVariables (as overwrite flag).
Thus, if attributes ==EFI_VARIABLE_APPEND_WRITE, should we returnEFI_INVALID_PARAMETER?Quoted 8 lines
lib/efi_loader/efi_var_common.c efi_status_t EFIAPI efi_query_variable_info( · line 186
Quoted 7 lines
lib/efi_loader/efi_var_common.c +3
-0+ ret =EFI_INVALID_PARAMETER ; + }else { + ret =efi_query_variable_info_int (attributes, maximum_variable_storage_size, remaining_variable_storage_size, maximum_variable_size);Quoted 4 lines
CHECK: Alignment should match open parenthesis
#44: FILE:lib/efi_loader/efi_var_common.c:184:
+ ret = efi_query_variable_info_int(attributes,
maximum_variable_storage_size,OK, let me fix that.
Thank you,
Quoted 11 lines
Best regards
Heinrich
Quoted 5 lines
+ }
return EFI_EXIT(ret); }--
Masami Hiramatsu
Signature · 1 line
Masami Hiramatsu