bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mgmt/mcumgr: Fix image erase returning improper error code on error

Browse Source 
The img_mgmt_erase could return MGMT_ERR_EOK even when
img_mgmt_impl_erase_slot failed.

Fixes #50522

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-09-22 10:13:05 +00:00 committed by Fabio Baltieri
parent ce1377c5ee
commit e4d0bf0e64
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt.c
View File

@ -279,17 +279,16 @@ img_mgmt_erase(struct mgmt_ctxt *ctxt)
}
rc = img_mgmt_impl_erase_slot(slot);
if (rc != 0) {
img_mgmt_dfu_stopped();
return rc;
}
if (rc == 0) {
ok = zcbor_tstr_put_lit(zse, "rc") &&
zcbor_int32_put(zse, 0);
if (zcbor_tstr_put_lit(zse, "rc") && zcbor_int32_put(zse, 0)) {
return MGMT_ERR_EOK;
}
return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;
return MGMT_ERR_EMSGSIZE;
}
static int