patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

mgmt: mcumgt: smp: Fix not checking returned status

Browse source 
Fixes not checking if a zcbor operation was successful.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2023-06-22 09:03:24 +01:00 committed by Carles Cufí
parent d98656f081
commit c9a4764c10
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subsys/mgmt/mcumgr/smp/src/smp.c
View file

@ -226,12 +226,18 @@ static int smp_handle_single_payload(struct smp_streamer *cbuf, const struct smp
}
if (handler_fn) {
bool ok;
*handler_found = true;
zcbor_map_start_encode(cbuf->writer->zs,
CONFIG_MCUMGR_SMP_CBOR_MAX_MAIN_MAP_ENTRIES);
ok = zcbor_map_start_encode(cbuf->writer->zs,
CONFIG_MCUMGR_SMP_CBOR_MAX_MAIN_MAP_ENTRIES);
MGMT_CTXT_SET_RC_RSN(cbuf, NULL);
if (!ok) {
return MGMT_ERR_EMSGSIZE;
}
#if defined(CONFIG_MCUMGR_SMP_COMMAND_STATUS_HOOKS)
cmd_recv.group = req_hdr->nh_group;
cmd_recv.id = req_hdr->nh_id;
@ -248,8 +254,8 @@ static int smp_handle_single_payload(struct smp_streamer *cbuf, const struct smp
if (status == MGMT_CB_ERROR_RC) {
rc = ret_rc;
} else {
bool ok = smp_add_cmd_ret(cbuf->writer->zs, ret_group,
(uint16_t)ret_rc);
ok = smp_add_cmd_ret(cbuf->writer->zs, ret_group,
(uint16_t)ret_rc);
rc = (ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE);
}