[mynewt-mcumgr] branch master updated: zephyr: Fix assert when image number out of range

[utzig]

This is an automated email from the ASF dual-hosted git repository.

utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git


The following commit(s) were added to refs/heads/master by this push:
     new 10cda4e  zephyr: Fix assert when image number out of range
10cda4e is described below

commit 10cda4e0c50c94dc5e92b27ce9643ee5be498138
Author: Dominik Ermel <dominik.er...@nordicsemi.no>
AuthorDate: Tue Sep 21 15:55:30 2021 +0000

    zephyr: Fix assert when image number out of range
    
    The img_mgmt_get_unused_slot_area_id is used as verification function,
    for user provided image number, and as such should return -1 when
    incorrect image number is given without logging assertion.
    The commit fixes above problem, and additionally it changes the error
    codes returned when a slot/image can not be correctly mapped,
    to a specific flash area id, to MGM_ERR_ENOENT.
    
    Signed-off-by: Dominik Ermel <dominik.er...@nordicsemi.no>
---
 cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c 
b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
index d3e5c10..e70fd0a 100644
--- a/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
+++ b/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
@@ -211,8 +211,6 @@ img_mgmt_get_unused_slot_area_id(int image)
         }
     } else if (image == 1) {
         area_id = zephyr_img_mgmt_flash_area_id(3);
-    } else {
-        assert(0);
     }
 
     return area_id;
@@ -266,7 +264,7 @@ img_mgmt_impl_erase_slot(void)
     /* Select any non-active, unused slot */
     best_id = img_mgmt_get_unused_slot_area_id(-1);
     if (best_id < 0) {
-        return MGMT_ERR_EUNKNOWN;
+        return MGMT_ERR_ENOENT;
     }
     rc = zephyr_img_mgmt_flash_check_empty(best_id, &empty);
     if (rc != 0) {
@@ -593,7 +591,7 @@ img_mgmt_impl_upload_inspect(const struct 
img_mgmt_upload_req *req,
         if (action->area_id < 0) {
             /* No slot where to upload! */
             *errstr = img_mgmt_err_str_no_slot;
-            return MGMT_ERR_ENOMEM;
+            return MGMT_ERR_ENOENT;
         }