efi: cosmetic patches for the error messages when
Subsystems (5)
v2 cover efi: cosmetic patches for the error messages when
When loading certificates list from EFI variables, the error messages and efi status codes always be emitted to dmesg. It looks ugly:
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx list
This cosmetic patch set moved the above messages to the error handling code path. And, it adds a function to convert EFI status code to a string for improving the readability of debug log. The function can also be used in other EFI logs.
v2:
The convert function be moved to efi.c
Lee, Chun-Yi (2):
efi: add a function to convert the status code to a string
efi: show error messages only when loading certificates is failed
drivers/firmware/efi/efi.c | 32 +++++++++++++++++++++ include/linux/efi.h | 1 + security/integrity/platform_certs/load_uefi.c | 41 ++++++++++++++------------- 3 files changed, 55 insertions(+), 19 deletions(-)
Signature · 1 line
2.16.4
PATCH v2 1/2 efi: add a function to convert the status code to a string
This function can be used to convert EFI status code to a string to improve the readability of log.
v2:
Moved the convert function to efi.c
--- drivers/firmware/efi/efi.c | 32 ++++++++++++++++++++++++++++++++ include/linux/efi.h | 1 + 2 files changed, 33 insertions(+)
drivers/firmware/efi/efi.c +32 -0
@@ -954,6 +954,38 @@ int efi_status_to_err(efi_status_t status)return err; } +#define EFI_STATUS_STR (_status) \ + EFI_##_status : return "EFI_" __stringify(_status) + +const char *efi_status_to_str (efi_status_t status) +{ +switch (status) { + case EFI_STATUS_STR(SUCCESS); + case EFI_STATUS_STR(LOAD_ERROR); + case EFI_STATUS_STR(INVALID_PARAMETER); + case EFI_STATUS_STR(UNSUPPORTED); + case EFI_STATUS_STR(BAD_BUFFER_SIZE); + case EFI_STATUS_STR(BUFFER_TOO_SMALL); + case EFI_STATUS_STR(NOT_READY); + case EFI_STATUS_STR(DEVICE_ERROR); + case EFI_STATUS_STR(WRITE_PROTECTED); + case EFI_STATUS_STR(OUT_OF_RESOURCES); + case EFI_STATUS_STR(NOT_FOUND); + case EFI_STATUS_STR(ABORTED); + case EFI_STATUS_STR(SECURITY_VIOLATION); + } +/* +* There are two possibilities for this message to be exposed: +* - Caller feeds a unknown status code from firmware. +* - A new status code be defined in efi.h but we forgot to update +* this function. +*/ +pr_warn ("Unknown efi status: 0x%lx\n" , status); + +return "Unknown efi status" ; +} +EXPORT_SYMBOL (efi_status_to_str); +static DEFINE_SPINLOCK (efi_mem_reserve_persistent_lock);static struct linux_efi_memreserve *efi_memreserve_root__ro_after_init ;
include/linux/efi.h +1 -0
@@ -1228,6 +1228,7 @@ efi_capsule_pending(int *reset_type)#endif extern int efi_status_to_err (efi_status_t status); +extern const char *efi_status_to_str (efi_status_t status);/* * Variable Attributes
Signature · 1 line
2.16.4
Re: [PATCH 1/2 v2] efi: add a function to convert the status code to a string
Quoted 7 lines · Chun-Yi
This function can be used to convert EFI status code to a string to improve the readability of log.
v2:
Moved the convert function toefi.c
Please put the patch series revision log below the ---
Quoted 1 line
Signed-off-by "Lee, Chun-Yi" <[email protected]>
Quoted 63 lines
--- drivers/firmware/efi/efi.c | 32 ++++++++++++++++++++++++++++++++ include/linux/efi.h | 1 + 2 files changed, 33 insertions(+)drivers/firmware/efi/efi.c +32
-0@@ -954,6 +954,38 @@ int efi_status_to_err(efi_status_t status)return err; } +#define EFI_STATUS_STR (_status) \ + EFI_##_status : return "EFI_" __stringify(_status) + +const char *efi_status_to_str (efi_status_t status) +{ +switch (status) { + case EFI_STATUS_STR(SUCCESS); + case EFI_STATUS_STR(LOAD_ERROR); + case EFI_STATUS_STR(INVALID_PARAMETER); + case EFI_STATUS_STR(UNSUPPORTED); + case EFI_STATUS_STR(BAD_BUFFER_SIZE); + case EFI_STATUS_STR(BUFFER_TOO_SMALL); + case EFI_STATUS_STR(NOT_READY); + case EFI_STATUS_STR(DEVICE_ERROR); + case EFI_STATUS_STR(WRITE_PROTECTED); + case EFI_STATUS_STR(OUT_OF_RESOURCES); + case EFI_STATUS_STR(NOT_FOUND); + case EFI_STATUS_STR(ABORTED); + case EFI_STATUS_STR(SECURITY_VIOLATION); + } +/* +* There are two possibilities for this message to be exposed: +* - Caller feeds a unknown status code from firmware. +* - A new status code be defined in efi.h but we forgot to update +* this function. +*/ +pr_warn ("Unknown efi status: 0x%lx\n" , status); + +return "Unknown efi status" ; +} +EXPORT_SYMBOL (efi_status_to_str); +static DEFINE_SPINLOCK (efi_mem_reserve_persistent_lock);static struct linux_efi_memreserve *efi_memreserve_root__ro_after_init ;include/linux/efi.h +1
-1@@ -1228,6 +1228,7 @@ efi_capsule_pending(int *reset_type)#endif extern int efi_status_to_err (efi_status_t status); +extern const char *efi_status_to_str (efi_status_t status);/* * Variable Attributes -- 2.16.4
Re: [PATCH 1/2 v2] efi: add a function to convert the status code to a string
Quoted 10 lines · Ard Biesheuvel
Quoted 7 lines · Chun-Yi
This function can be used to convert EFI status code to a string to improve the readability of log.
v2:
Moved the convert function toefi.cPlease put the patch series revision log below the ---
OK! I will move to below the --- next time.
Quoted 5 lines
Quoted 2 lines
Signed-off-by "Lee, Chun-Yi" <[email protected]>Acked-by Ard Biesheuvel <[email protected]>
Thanks for your review!
Quoted 1 line
Quoted 1 line
---
v2:
Moved the convert function to efi.c
Quoted 3 lines
Quoted 3 lines
drivers/firmware/efi/efi.c | 32 ++++++++++++++++++++++++++++++++ include/linux/efi.h | 1 + 2 files changed, 33 insertions(+)
Do you mean move the revision log to here like the above?
Thanks a lot!
Joey Lee
Quoted 59 lines
Quoted 59 lines
drivers/firmware/efi/efi.c +32
-0@@ -954,6 +954,38 @@ int efi_status_to_err(efi_status_t status)return err; } +#define EFI_STATUS_STR (_status) \ + EFI_##_status : return "EFI_" __stringify(_status) + +const char *efi_status_to_str (efi_status_t status) +{ +switch (status) { + case EFI_STATUS_STR(SUCCESS); + case EFI_STATUS_STR(LOAD_ERROR); + case EFI_STATUS_STR(INVALID_PARAMETER); + case EFI_STATUS_STR(UNSUPPORTED); + case EFI_STATUS_STR(BAD_BUFFER_SIZE); + case EFI_STATUS_STR(BUFFER_TOO_SMALL); + case EFI_STATUS_STR(NOT_READY); + case EFI_STATUS_STR(DEVICE_ERROR); + case EFI_STATUS_STR(WRITE_PROTECTED); + case EFI_STATUS_STR(OUT_OF_RESOURCES); + case EFI_STATUS_STR(NOT_FOUND); + case EFI_STATUS_STR(ABORTED); + case EFI_STATUS_STR(SECURITY_VIOLATION); + } +/* +* There are two possibilities for this message to be exposed: +* - Caller feeds a unknown status code from firmware. +* - A new status code be defined in efi.h but we forgot to update +* this function. +*/ +pr_warn ("Unknown efi status: 0x%lx\n" , status); + +return "Unknown efi status" ; +} +EXPORT_SYMBOL (efi_status_to_str); +static DEFINE_SPINLOCK (efi_mem_reserve_persistent_lock);static struct linux_efi_memreserve *efi_memreserve_root__ro_after_init ;include/linux/efi.h +1
-1@@ -1228,6 +1228,7 @@ efi_capsule_pending(int *reset_type)#endif extern int efi_status_to_err (efi_status_t status); +extern const char *efi_status_to_str (efi_status_t status);/* * Variable Attributes -- 2.16.4
PATCH v2 2/2 efi: show error messages only when loading certificates is failed
In reply to Lee, Chun-YiWhen loading certificates list from EFI variables, the error message and efi status code always be emitted to dmesg. It looks ugly:
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx list
This cosmetic patch moved the messages to the error handling code path. And, it also shows the corresponding status string of status code.
--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-)
security/integrity/platform_certs/load_uefi.c +21 -19
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/kernel.h> #include <linux/sched.h>
@@ -39,7 +40,7 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,const char *source) {efi_status_t status;unsigned long lsize =4 ;
@@ -48,23 +49,30 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb);if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); -return NULL ; +if (status ==EFI_NOT_FOUND ) { +pr_debug ("%s list was not found\n" , source); +return NULL ; + } + goto err; } db =kmalloc (lsize,GFP_KERNEL ); -if (!db) -return NULL ; +if (!db) { + status =EFI_OUT_OF_RESOURCES ; + goto err; + } status = efi.get_variable (name, guid,NULL , &lsize, db);if (status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); -return NULL ; + goto err; } *size = lsize;return db; +err: +pr_err ("Couldn't get %s list: %s\n" , source,efi_status_to_str (status)); +return NULL ; }/*
@@ -153,10 +161,8 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); -if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); - }else { + db =get_cert_list (L"db" , &secure_var, &dbsize,"UEFI:db" ); +if (db) { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);if (rc)
@@ -166,10 +172,8 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); -if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); - }else { + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize,"UEFI:MokListRT" ); +if (mok) { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);if (rc)
@@ -177,10 +181,8 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); -if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); - }else { + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize,"UEFI:dbx" ); +if (dbx) { rc =parse_efi_signature_list ("UEFI:dbx" , dbx, dbxsize, get_handler_for_dbx);
Signature · 1 line
2.16.4
Re: [PATCH 2/2] efi: show error messages only when loading certificates is failed
Quoted 5 lines · Chun-Yi
When loading certificates list from EFI variables, the error message and efi status code always be emitted to dmesg. It looks ugly:
Quoted 9 lines
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx listThis cosmetic patch moved the messages to the error handling code path. And, it also shows the corresponding status string of status code.
So what output do we get after applying this patch when those variables don't exist?
Quoted 103 lines
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-)security/integrity/platform_certs/load_uefi.c +21
-20@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/kernel.h> #include <linux/sched.h> @@ -39,7 +40,7 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,const char *source) {efi_status_t status;unsigned long lsize =4 ;@@ -48,23 +49,30 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb);if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); -return NULL ; +if (status ==EFI_NOT_FOUND ) { +pr_debug ("%s list was not found\n" , source); +return NULL ; + } + goto err; } db =kmalloc (lsize,GFP_KERNEL ); -if (!db) -return NULL ; +if (!db) { + status =EFI_OUT_OF_RESOURCES ; + goto err; + } status = efi.get_variable (name, guid,NULL , &lsize, db);if (status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); -return NULL ; + goto err; } *size = lsize;return db; +err: +pr_err ("Couldn't get %s list: %s\n" , source,efi_status_to_str (status)); +return NULL ; }/* @@ -153,10 +161,8 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); -if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); - }else { + db =get_cert_list (L"db" , &secure_var, &dbsize,"UEFI:db" ); +if (db) { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);if (rc)@@ -166,10 +172,8 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); -if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); - }else { + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize,"UEFI:MokListRT" ); +if (mok) { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);if (rc)@@ -177,10 +181,8 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); -if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); - }else { + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize,"UEFI:dbx" ); +if (dbx) { rc =parse_efi_signature_list ("UEFI:dbx" , dbx, dbxsize, get_handler_for_dbx); --2.16.4
Re: [PATCH 2/2] efi: show error messages only when loading certificates is failed
Hi Ard,
Quoted 11 lines · Ard Biesheuvel
Quoted 10 lines · Chun-Yi
When loading certificates list from EFI variables, the error message and efi status code always be emitted to dmesg. It looks ugly:
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx list
Quoted 8 lines
Quoted 4 lines
This cosmetic patch moved the messages to the error handling code path. And, it also shows the corresponding status string of status code.
So what output do we get after applying this patch when those variables don't exist?
A "UEFI:xxxx list was not found" message will be exposed in dmesg when kernel loglevel be set to debug. Otherwise there have no messages.
Thanks
Joey Lee
Quoted 103 lines
Quoted 103 lines
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-)security/integrity/platform_certs/load_uefi.c +21
-20@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/kernel.h> #include <linux/sched.h> @@ -39,7 +40,7 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,const char *source) {efi_status_t status;unsigned long lsize =4 ;@@ -48,23 +49,30 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb);if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); -return NULL ; +if (status ==EFI_NOT_FOUND ) { +pr_debug ("%s list was not found\n" , source); +return NULL ; + } + goto err; } db =kmalloc (lsize,GFP_KERNEL ); -if (!db) -return NULL ; +if (!db) { + status =EFI_OUT_OF_RESOURCES ; + goto err; + } status = efi.get_variable (name, guid,NULL , &lsize, db);if (status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); -return NULL ; + goto err; } *size = lsize;return db; +err: +pr_err ("Couldn't get %s list: %s\n" , source,efi_status_to_str (status)); +return NULL ; }/* @@ -153,10 +161,8 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); -if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); - }else { + db =get_cert_list (L"db" , &secure_var, &dbsize,"UEFI:db" ); +if (db) { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);if (rc)@@ -166,10 +172,8 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); -if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); - }else { + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize,"UEFI:MokListRT" ); +if (mok) { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);if (rc)@@ -177,10 +181,8 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); -if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); - }else { + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize,"UEFI:dbx" ); +if (dbx) { rc =parse_efi_signature_list ("UEFI:dbx" , dbx, dbxsize, get_handler_for_dbx); --2.16.4
Ard Biesheuvel
Acked-byRe: [PATCH 2/2] efi: show error messages only when loading certificates is failed
Quoted 20 lines · Joey Lee
Hi Ard,
Quoted 16 lines · Ard Biesheuvel
Quoted 14 lines · Chun-Yi
When loading certificates list from EFI variables, the error message and efi status code always be emitted to dmesg. It looks ugly:
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx listThis cosmetic patch moved the messages to the error handling code path. And, it also shows the corresponding status string of status code.
Quoted 7 lines
Quoted 3 lines
So what output do we get after applying this patch when those variables don't exist?
A "UEFI:xxxx list was not found" message will be exposed in dmesg when kernel loglevel be set to debug. Otherwise there have no messages.
OK, that works for me.
I take it this will go via the linux-security tree along with 1/2?
Quoted 103 lines
Quoted 103 lines
Quoted 103 lines
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-)security/integrity/platform_certs/load_uefi.c +21
-20@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/kernel.h> #include <linux/sched.h> @@ -39,7 +40,7 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,const char *source) {efi_status_t status;unsigned long lsize =4 ;@@ -48,23 +49,30 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb);if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); -return NULL ; +if (status ==EFI_NOT_FOUND ) { +pr_debug ("%s list was not found\n" , source); +return NULL ; + } + goto err; } db =kmalloc (lsize,GFP_KERNEL ); -if (!db) -return NULL ; +if (!db) { + status =EFI_OUT_OF_RESOURCES ; + goto err; + } status = efi.get_variable (name, guid,NULL , &lsize, db);if (status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); -return NULL ; + goto err; } *size = lsize;return db; +err: +pr_err ("Couldn't get %s list: %s\n" , source,efi_status_to_str (status)); +return NULL ; }/* @@ -153,10 +161,8 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); -if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); - }else { + db =get_cert_list (L"db" , &secure_var, &dbsize,"UEFI:db" ); +if (db) { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);if (rc)@@ -166,10 +172,8 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); -if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); - }else { + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize,"UEFI:MokListRT" ); +if (mok) { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);if (rc)@@ -177,10 +181,8 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); -if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); - }else { + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize,"UEFI:dbx" ); +if (dbx) { rc =parse_efi_signature_list ("UEFI:dbx" , dbx, dbxsize, get_handler_for_dbx); --2.16.4
Re: [PATCH 2/2] efi: show error messages only when loading certificates is failed
Hi Ard,
Quoted 25 lines · Ard Biesheuvel
Quoted 24 lines · Joey Lee
Hi Ard,
Quoted 19 lines · Ard Biesheuvel
Quoted 5 lines · Chun-Yi
When loading certificates list from EFI variables, the error message and efi status code always be emitted to dmesg. It looks ugly:
Quoted 9 lines
[ 2.335031] Couldn't get size: 0x800000000000000e [ 2.335032] Couldn't get UEFI MokListRT [ 2.339985] Couldn't get size: 0x800000000000000e [ 2.339987] Couldn't get UEFI dbx listThis cosmetic patch moved the messages to the error handling code path. And, it also shows the corresponding status string of status code.
So what output do we get after applying this patch when those variables don't exist?
Quoted 8 lines
Quoted 3 lines
A "UEFI:xxxx list was not found" message will be exposed in dmesg when kernel loglevel be set to debug. Otherwise there have no messages.
OK, that works for me.
I take it this will go via the linux-security tree along with 1/2?
Yes, this patch must go with 1/2 patch.
Quoted 2 lines
Acked-by Ard Biesheuvel <[email protected]>
Thanks for your review!
Joey Lee
Quoted 105 lines
Quoted 105 lines
Quoted 105 lines
Quoted 105 lines
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-)security/integrity/platform_certs/load_uefi.c +21
-20@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/kernel.h> #include <linux/sched.h> @@ -39,7 +40,7 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,const char *source) {efi_status_t status;unsigned long lsize =4 ;@@ -48,23 +49,30 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb);if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); -return NULL ; +if (status ==EFI_NOT_FOUND ) { +pr_debug ("%s list was not found\n" , source); +return NULL ; + } + goto err; } db =kmalloc (lsize,GFP_KERNEL ); -if (!db) -return NULL ; +if (!db) { + status =EFI_OUT_OF_RESOURCES ; + goto err; + } status = efi.get_variable (name, guid,NULL , &lsize, db);if (status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); -return NULL ; + goto err; } *size = lsize;return db; +err: +pr_err ("Couldn't get %s list: %s\n" , source,efi_status_to_str (status)); +return NULL ; }/* @@ -153,10 +161,8 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); -if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); - }else { + db =get_cert_list (L"db" , &secure_var, &dbsize,"UEFI:db" ); +if (db) { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);if (rc)@@ -166,10 +172,8 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); -if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); - }else { + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize,"UEFI:MokListRT" ); +if (mok) { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);if (rc)@@ -177,10 +181,8 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); -if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); - }else { + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize,"UEFI:dbx" ); +if (dbx) { rc =parse_efi_signature_list ("UEFI:dbx" , dbx, dbxsize, get_handler_for_dbx); --2.16.4