torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

efi: stmm: Drop unused EFI error from setup_mm_hdr arguments

Browse Source 
No caller ever evaluates what we return in 'ret'. They only use the
return code of the function.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Acked-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Jan Kiszka 2025-08-25 18:07:12 +02:00 committed by Ard Biesheuvel
parent 80c6c10486
commit 01a3044af5
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/firmware/efi/stmm/tee_stmm_efi.c
View File

@ -154,11 +154,9 @@ static efi_status_t mm_communicate(u8 *comm_buf, size_t payload_size)
* @dptr: pointer address to store allocated buffer * @dptr: pointer address to store allocated buffer
* @payload_size: payload size * @payload_size: payload size
* @func: standAloneMM function number * @func: standAloneMM function number
* @ret: EFI return code
* Return: pointer to corresponding StandAloneMM function buffer or NULL * Return: pointer to corresponding StandAloneMM function buffer or NULL
*/ */
static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func, static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func)
efi_status_t *ret)
{ {
const efi_guid_t mm_var_guid = EFI_MM_VARIABLE_GUID; const efi_guid_t mm_var_guid = EFI_MM_VARIABLE_GUID;
struct efi_mm_communicate_header *mm_hdr; struct efi_mm_communicate_header *mm_hdr;
@ -173,16 +171,13 @@ static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func,
if (max_buffer_size && if (max_buffer_size &&
max_buffer_size < (MM_COMMUNICATE_HEADER_SIZE + max_buffer_size < (MM_COMMUNICATE_HEADER_SIZE +
MM_VARIABLE_COMMUNICATE_SIZE + payload_size)) { MM_VARIABLE_COMMUNICATE_SIZE + payload_size)) {
*ret = EFI_INVALID_PARAMETER;
return NULL; return NULL;
} }
comm_buf = alloc_pages_exact(COMM_BUF_SIZE(payload_size), comm_buf = alloc_pages_exact(COMM_BUF_SIZE(payload_size),
GFP_KERNEL | __GFP_ZERO); GFP_KERNEL | __GFP_ZERO);
if (!comm_buf) { if (!comm_buf)
*ret = EFI_OUT_OF_RESOURCES;
return NULL; return NULL;
}
mm_hdr = (struct efi_mm_communicate_header *)comm_buf; mm_hdr = (struct efi_mm_communicate_header *)comm_buf;
memcpy(&mm_hdr->header_guid, &mm_var_guid, sizeof(mm_hdr->header_guid)); memcpy(&mm_hdr->header_guid, &mm_var_guid, sizeof(mm_hdr->header_guid));
@ -192,7 +187,6 @@ static void *setup_mm_hdr(u8 **dptr, size_t payload_size, size_t func,
var_hdr->function = func; var_hdr->function = func;
if (dptr) if (dptr)
*dptr = comm_buf; *dptr = comm_buf;
*ret = EFI_SUCCESS;
return var_hdr->data; return var_hdr->data;
} }
@ -215,8 +209,7 @@ static efi_status_t get_max_payload(size_t *size)
payload_size = sizeof(*var_payload); payload_size = sizeof(*var_payload);
var_payload = setup_mm_hdr(&comm_buf, payload_size, var_payload = setup_mm_hdr(&comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE, SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE);
&ret);
if (!var_payload) if (!var_payload)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -262,7 +255,7 @@ static efi_status_t get_property_int(u16 *name, size_t name_size,
smm_property = setup_mm_hdr( smm_property = setup_mm_hdr(
&comm_buf, payload_size, &comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET, &ret); SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET);
if (!smm_property) if (!smm_property)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -318,7 +311,7 @@ static efi_status_t tee_get_variable(u16 *name, efi_guid_t *vendor,
payload_size = MM_VARIABLE_ACCESS_HEADER_SIZE + name_size + tmp_dsize; payload_size = MM_VARIABLE_ACCESS_HEADER_SIZE + name_size + tmp_dsize;
var_acc = setup_mm_hdr(&comm_buf, payload_size, var_acc = setup_mm_hdr(&comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_GET_VARIABLE, &ret); SMM_VARIABLE_FUNCTION_GET_VARIABLE);
if (!var_acc) if (!var_acc)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -383,8 +376,7 @@ static efi_status_t tee_get_next_variable(unsigned long *name_size,
payload_size = MM_VARIABLE_GET_NEXT_HEADER_SIZE + out_name_size; payload_size = MM_VARIABLE_GET_NEXT_HEADER_SIZE + out_name_size;
var_getnext = setup_mm_hdr(&comm_buf, payload_size, var_getnext = setup_mm_hdr(&comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME, SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME);
&ret);
if (!var_getnext) if (!var_getnext)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -440,7 +432,7 @@ static efi_status_t tee_set_variable(efi_char16_t *name, efi_guid_t *vendor,
* the properties, if the allocation fails * the properties, if the allocation fails
*/ */
var_acc = setup_mm_hdr(&comm_buf, payload_size, var_acc = setup_mm_hdr(&comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_SET_VARIABLE, &ret); SMM_VARIABLE_FUNCTION_SET_VARIABLE);
if (!var_acc) if (!var_acc)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
@ -495,8 +487,7 @@ static efi_status_t tee_query_variable_info(u32 attributes,
payload_size = sizeof(*mm_query_info); payload_size = sizeof(*mm_query_info);
mm_query_info = setup_mm_hdr(&comm_buf, payload_size, mm_query_info = setup_mm_hdr(&comm_buf, payload_size,
SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO, SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO);
&ret);
if (!mm_query_info) if (!mm_query_info)
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;