Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70839090 authored by Khalid Aziz's avatar Khalid Aziz Committed by Greg Kroah-Hartman
Browse files

firmware: Add missing attributes to EFI variable attribute print out from sysfs 



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: default avatarKhalid Aziz <khalid.aziz@hp.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarMatthew Garrett <mjg@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfe016b1

drivers/firmware/efivars.c

+14 −3
Original line number Diff line number Diff line
@@ -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;

}