Commit 80c6c104 authored by Jan Kiszka's avatar Jan Kiszka Committed by Ard Biesheuvel
Browse files

efi: stmm: Do not return EFI_OUT_OF_RESOURCES on internal errors 



When we are low on memory or when the internal API is violated, we
cannot return EFI_OUT_OF_RESOURCES. According to the UEFI standard, that
error code is either related to persistent storage used for the variable
or even not foreseen as possible error (GetVariable e.g.). Use the not
fully accurate but compliant error code EFI_DEVICE_ERROR in those cases.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
Acked-by: default avatarSumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent c5e81e67

drivers/firmware/efi/stmm/tee_stmm_efi.c

+6 −6
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static efi_status_t get_max_payload(size_t *size) 
				   SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE,

				   &ret);

	if (!var_payload)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	ret = mm_communicate(comm_buf, payload_size);

	if (ret != EFI_SUCCESS)
@@ -264,7 +264,7 @@ static efi_status_t get_property_int(u16 *name, size_t name_size, 
		&comm_buf, payload_size,

		SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET, &ret);

	if (!smm_property)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	memcpy(&smm_property->guid, vendor, sizeof(smm_property->guid));

	smm_property->name_size = name_size;
@@ -320,7 +320,7 @@ static efi_status_t tee_get_variable(u16 *name, efi_guid_t *vendor, 
	var_acc = setup_mm_hdr(&comm_buf, payload_size,

			       SMM_VARIABLE_FUNCTION_GET_VARIABLE, &ret);

	if (!var_acc)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	/* Fill in contents */

	memcpy(&var_acc->guid, vendor, sizeof(var_acc->guid));
@@ -386,7 +386,7 @@ static efi_status_t tee_get_next_variable(unsigned long *name_size, 
				   SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME,

				   &ret);

	if (!var_getnext)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	/* Fill in contents */

	memcpy(&var_getnext->guid, guid, sizeof(var_getnext->guid));
@@ -442,7 +442,7 @@ static efi_status_t tee_set_variable(efi_char16_t *name, efi_guid_t *vendor, 
	var_acc = setup_mm_hdr(&comm_buf, payload_size,

			       SMM_VARIABLE_FUNCTION_SET_VARIABLE, &ret);

	if (!var_acc)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	/*

	 * The API has the ability to override RO flags. If no RO check was
@@ -498,7 +498,7 @@ static efi_status_t tee_query_variable_info(u32 attributes, 
				SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO,

				&ret);

	if (!mm_query_info)

		return EFI_OUT_OF_RESOURCES;

		return EFI_DEVICE_ERROR;



	mm_query_info->attr = attributes;

	ret = mm_communicate(comm_buf, payload_size);