zephyr
/
mcumgr
mirror of https://github.com/zephyrproject-rtos/mcumgr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

img_mgmt: Fix bug with not resetting upload status 

Fixes an issue with the upload status not being set if an error
occurs or if the slot is erased, which would then wrongly cause
the upload to continue at a non-zero offset, skipping uploading
missing data.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2022-11-14 12:28:58 +00:00
parent 9ffebd5e92
commit 57ecc05d93
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/img_mgmt/src/img_mgmt.c
View File

@ -288,6 +288,15 @@ img_mgmt_error_rsp(struct mgmt_ctxt *ctxt, int rc, const char *rsn)
}
#endif
/*
* Resets upload status to defaults (no upload in progress)
*/
void img_mgmt_reset_upload(void)
{
memset(&g_img_mgmt_state, 0, sizeof(g_img_mgmt_state));
g_img_mgmt_state.area_id = -1;
}
/**
* Command handler: image erase
*/
@ -311,8 +320,9 @@ img_mgmt_erase(struct mgmt_ctxt *ctxt)
return MGMT_ERR_EBADSTATE;
}
}
rc = img_mgmt_impl_erase_slot();
img_mgmt_reset_upload();
if (!rc) {
img_mgmt_dfu_stopped();
@ -400,6 +410,7 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt)
.upgrade = false,
.image = 0,
};
bool reset = false;
const struct cbor_attr_t off_attr[] = {
[0] = {
@ -526,6 +537,7 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt)
if (img_mgmt_impl_erase_if_needed(req.off, action.write_bytes) != 0) {
rc = MGMT_ERR_EUNKNOWN;
errstr = img_mgmt_err_str_flash_erase_failed;
reset = true;
goto end;
}
#endif
@ -538,6 +550,7 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt)
if (rc != 0) {
rc = MGMT_ERR_EUNKNOWN;
errstr = img_mgmt_err_str_flash_write_failed;
reset = true;
goto end;
} else {
g_img_mgmt_state.off += action.write_bytes;
@ -556,6 +569,11 @@ end:
mgmt_evt(MGMT_EVT_OP_CMD_STATUS, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ID_UPLOAD,
&cmd_status_arg);
if (reset == true || rc != 0) {
/* Reset the upload state struct back to default */
img_mgmt_reset_upload();
}
if (rc != 0) {
img_mgmt_dfu_stopped();
return img_mgmt_error_rsp(ctxt, rc, errstr);