Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 20:38:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(rss): fix msg deserialization bugs in comms" into integration

Browse source
This commit is contained in:
Manish V Badarkhe 2023-03-14 15:19:21 +01:00 • committed by TrustedFirmware Code Review
commit 17628eb585
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/arm/rss/rss_comms_protocol_embed.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, Arm Limited. All rights reserved. * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -54,7 +54,9 @@ psa_status_t rss_protocol_embed_serialize_msg(psa_handle_t handle,
if (in_vec[i].len > sizeof(msg->trailer) - payload_size) { if (in_vec[i].len > sizeof(msg->trailer) - payload_size) {
return PSA_ERROR_INVALID_ARGUMENT; return PSA_ERROR_INVALID_ARGUMENT;
} }
memcpy(msg->trailer + payload_size, in_vec[i].base, in_vec[i].len); memcpy(msg->trailer + payload_size,
in_vec[i].base,
in_vec[i].len);
payload_size += in_vec[i].len; payload_size += in_vec[i].len;
} }
@ -77,12 +79,16 @@ psa_status_t rss_protocol_embed_deserialize_reply(psa_outvec *out_vec,
assert(return_val != NULL); assert(return_val != NULL);
for (i = 0U; i < out_len; ++i) { for (i = 0U; i < out_len; ++i) {
if (sizeof(reply) - sizeof(reply->trailer) + payload_offset > reply_size) { if ((sizeof(*reply) - sizeof(reply->trailer) + payload_offset)
> reply_size) {
return PSA_ERROR_INVALID_ARGUMENT; return PSA_ERROR_INVALID_ARGUMENT;
} }
memcpy(out_vec[i].base, reply->trailer + payload_offset, out_vec[i].len); memcpy(out_vec[i].base,
payload_offset += out_vec[i].len; reply->trailer + payload_offset,
reply->out_size[i]);
out_vec[i].len = reply->out_size[i];
payload_offset += reply->out_size[i];
} }
*return_val = reply->return_val; *return_val = reply->return_val;