You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2026/10/26 15:04:48 UTC

(mynewt-core) 02/08: sys/flash_map: Fix range checks in flash area access

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

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

commit 9645d5b1d9bdad6ff6b051a0e2d3babbdaffbdb2
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Sun Oct 25 23:31:13 2026 +0100

    sys/flash_map: Fix range checks in flash area access
    
    Range check computed offset + length which could wrap around for
    large lengths. flash_area_read_is_empty() did not check the range at
    all, so it could read outside of flash area, e.g. when called with
    offset computed from on-flash data.
    
    Assisted-by: Claude:claude-opus-5-5
---
 sys/flash_map/src/flash_map.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/sys/flash_map/src/flash_map.c b/sys/flash_map/src/flash_map.c
index a49391b9e..1dd5900de 100644
--- a/sys/flash_map/src/flash_map.c
+++ b/sys/flash_map/src/flash_map.c
@@ -245,11 +245,21 @@ end:
     return rc;
 }
 
+/* Checks that range of len bytes starting at off is within flash area */
+static int
+flash_area_check_range(const struct flash_area *fa, uint32_t off, uint32_t len)
+{
+    if (off > fa->fa_size || len > fa->fa_size - off) {
+        return -1;
+    }
+    return 0;
+}
+
 int
 flash_area_read(const struct flash_area *fa, uint32_t off, void *dst,
     uint32_t len)
 {
-    if (off > fa->fa_size || off + len > fa->fa_size) {
+    if (flash_area_check_range(fa, off, len)) {
         return -1;
     }
     return hal_flash_read(fa->fa_device_id, fa->fa_off + off, dst, len);
@@ -259,7 +269,7 @@ int
 flash_area_write(const struct flash_area *fa, uint32_t off, const void *src,
     uint32_t len)
 {
-    if (off > fa->fa_size || off + len > fa->fa_size) {
+    if (flash_area_check_range(fa, off, len)) {
         return -1;
     }
     return hal_flash_write(fa->fa_device_id, fa->fa_off + off,
@@ -269,7 +279,7 @@ flash_area_write(const struct flash_area *fa, uint32_t off, const void *src,
 int
 flash_area_erase(const struct flash_area *fa, uint32_t off, uint32_t len)
 {
-    if (off > fa->fa_size || off + len > fa->fa_size) {
+    if (flash_area_check_range(fa, off, len)) {
         return -1;
     }
     return hal_flash_erase(fa->fa_device_id, fa->fa_off + off, len);
@@ -320,6 +330,9 @@ int
 flash_area_read_is_empty(const struct flash_area *fa, uint32_t off, void *dst,
                          uint32_t len)
 {
+    if (flash_area_check_range(fa, off, len)) {
+        return -1;
+    }
     return hal_flash_isempty(fa->fa_device_id, fa->fa_off + off, dst, len);
 }