[mynewt-core] branch master updated: sys/flash_map: Check return values of hal_bsp_flash_dev() for null

[janc]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d5a9feb3d sys/flash_map: Check return values of hal_bsp_flash_dev() 
for null
d5a9feb3d is described below

commit d5a9feb3d90327fcdc5ab757f00851173f3fb511
Author: Mingjie Shen <shen...@purdue.edu>
AuthorDate: Thu Jun 15 19:05:42 2023 -0400

    sys/flash_map: Check return values of hal_bsp_flash_dev() for null
    
    Omitting the null check can cause null pointer dereference.
    
    Signed-off-by: Mingjie Shen <shen...@purdue.edu>
---
 sys/flash_map/src/flash_map.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sys/flash_map/src/flash_map.c b/sys/flash_map/src/flash_map.c
index f5b7b139d..ff0324629 100644
--- a/sys/flash_map/src/flash_map.c
+++ b/sys/flash_map/src/flash_map.c
@@ -88,6 +88,11 @@ flash_area_to_sectors(int id, int *cnt, struct flash_area 
*ret)
     *cnt = 0;
 
     hf = hal_bsp_flash_dev(fa->fa_device_id);
+    if (!hf) {
+        flash_area_close(fa);
+        return SYS_EINVAL;
+    }
+
     for (i = 0; i < hf->hf_sector_cnt; i++) {
         hf->hf_itf->hff_sector_info(hf, i, &start, &size);
         if (start >= fa->fa_off && start < fa->fa_off + fa->fa_size) {
@@ -147,6 +152,11 @@ flash_area_to_sector_ranges(int id, int *cnt, struct 
flash_sector_range *ret)
     }
 
     hf = hal_bsp_flash_dev(fa->fa_device_id);
+    if (!hf) {
+        flash_area_close(fa);
+        return SYS_EINVAL;
+    }
+
     for (i = 0; i < hf->hf_sector_cnt; i++) {
         hf->hf_itf->hff_sector_info(hf, i, &start, &size);
         if (start >= fa->fa_off && start < fa->fa_off + fa->fa_size) {
@@ -211,6 +221,11 @@ flash_area_getnext_sector(int id, int *sec_id, struct 
flash_area *ret)
         goto end;
     }
     hf = hal_bsp_flash_dev(fa->fa_device_id);
+    if (!hf) {
+        rc = SYS_EINVAL;
+        goto end;
+    }
+
     i = *sec_id + 1;
     for (; i < hf->hf_sector_cnt; i++) {
         hf->hf_itf->hff_sector_info(hf, i, &start, &size);