Skip to content

core: spmc: fix tx buffer overrun in the retrieve response #7960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenswikl merged 1 commit into from
Aug 31, 2026
+8 −4
Merged

core: spmc: fix tx buffer overrun in the retrieve response #7960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions core/arch/arm/kernel/spmc_sp_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ check_retrieve_request(struct sp_mem_receiver *receiver, uint32_t ffa_vers,
uint32_t retr_flags = mem_trans->flags;
uint64_t retr_tag = mem_trans->tag;
struct sp_mem_map_region *reg = NULL;
size_t mem_acc_size = 0;

/*
* The request came from the endpoint. It should only have one
Expand Down Expand Up @@ -528,14 +529,17 @@ check_retrieve_request(struct sp_mem_receiver *receiver, uint32_t ffa_vers,
return TEE_ERROR_BAD_PARAMETERS;
}

/*
* Check if there is enough space in the tx buffer to send the respons.
*/
/* Check that the response fits in the tx buffer. */
if (ffa_vers <= FFA_VERSION_1_1)
mem_acc_size = sizeof(struct ffa_mem_access_1_0);
else
mem_acc_size = sizeof(struct ffa_mem_access_1_2);

if (ffa_vers <= FFA_VERSION_1_0)
tx_len -= sizeof(struct ffa_mem_transaction_1_0);
else
tx_len -= sizeof(struct ffa_mem_transaction_1_1);
tx_len -= mem_trans->mem_access_size + sizeof(struct ffa_mem_region);
tx_len -= mem_acc_size + sizeof(struct ffa_mem_region);

if (tx_len < 0)
return FFA_NO_MEMORY;
Expand Down
Loading