| From: Khalid Aziz <khalid.aziz@hp.com> |
| Date: Mon, 10 Sep 2012 12:52:42 -0600 |
| Subject: firmware: Add missing attributes to EFI variable attribute print out |
| from sysfs |
| |
| commit 7083909023bbe29b3176e92d2d089def1aa7aa1e upstream. |
| |
| Some of the EFI variable attributes are missing from print out from |
| /sys/firmware/efi/vars/*/attributes. This patch adds those in. It also |
| updates code to use pre-defined constants for masking current value |
| of attributes. |
| |
| Signed-off-by: Khalid Aziz <khalid.aziz@hp.com> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Acked-by: Matthew Garrett <mjg@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/firmware/efivars.c | 17 ++++++++++++++--- |
| 1 file changed, 14 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c |
| index 47408e8..d10c987 100644 |
| --- a/drivers/firmware/efivars.c |
| +++ b/drivers/firmware/efivars.c |
| @@ -435,12 +435,23 @@ efivar_attr_read(struct efivar_entry *entry, char *buf) |
| if (status != EFI_SUCCESS) |
| return -EIO; |
| |
| - if (var->Attributes & 0x1) |
| + if (var->Attributes & EFI_VARIABLE_NON_VOLATILE) |
| str += sprintf(str, "EFI_VARIABLE_NON_VOLATILE\n"); |
| - if (var->Attributes & 0x2) |
| + if (var->Attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS) |
| str += sprintf(str, "EFI_VARIABLE_BOOTSERVICE_ACCESS\n"); |
| - if (var->Attributes & 0x4) |
| + if (var->Attributes & EFI_VARIABLE_RUNTIME_ACCESS) |
| str += sprintf(str, "EFI_VARIABLE_RUNTIME_ACCESS\n"); |
| + if (var->Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) |
| + str += sprintf(str, "EFI_VARIABLE_HARDWARE_ERROR_RECORD\n"); |
| + if (var->Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) |
| + str += sprintf(str, |
| + "EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS\n"); |
| + if (var->Attributes & |
| + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) |
| + str += sprintf(str, |
| + "EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS\n"); |
| + if (var->Attributes & EFI_VARIABLE_APPEND_WRITE) |
| + str += sprintf(str, "EFI_VARIABLE_APPEND_WRITE\n"); |
| return str - buf; |
| } |
| |
