erase-region: Check if the address and size is multiple of 4096 and add HIL test (#771)

* erase-region: Check if the address and size is multiple of 4096 and add test

* changelog

* reviews

* updated test

Author: JurajSadel

CHANGELOG.md

@@ -17,13 +17,13 @@ Add list-ports command to list available serial ports.
 ### Changed
 - Split the baudrate for connecting and monitorinig in `flash` subcommand (#737)
 - Normalized arguments of the CLI commands (#759)
-
 - `board-info` now prints `Security information`. (#758)
 
 ### Fixed
 
 - Update the app image SHA in the correct location for padded images (#715)
 - Fix `-s` argument collision (#731)
+- `address` and `size` in `erase-region` have to be multiples of 4096 (#771)
 
 ### Removed
 

espflash/src/cli/mod.rs

@@ -45,6 +45,7 @@ use crate::{
         FlashSize,
         Flasher,
         ProgressCallbacks,
+        FLASH_SECTOR_SIZE,
     },
     targets::{Chip, XtalFrequency},
 };
@@ -716,6 +717,14 @@ pub fn erase_region(args: EraseRegionArgs, config: &Config) -> Result<()> {
         return Err(Error::StubRequired).into_diagnostic();
     }
 
+    if args.address % FLASH_SECTOR_SIZE as u32 != 0 || args.size % FLASH_SECTOR_SIZE as u32 != 0 {
+        return Err(Error::InvalidEraseRegionArgument {
+            address: args.address,
+            size: args.size,
+        })
+        .into_diagnostic();
+    }
+
     let mut flasher = connect(&args.connect_args, config, true, true)?;
 
     info!(

espflash/src/error.rs

@@ -217,6 +217,13 @@ pub enum Error {
     #[error("Invalid response: {0}")]
     #[diagnostic(code(espflash::invalid_response))]
     InvalidResponse(String),
+
+    #[error("Invalid `address`({address})  and/or `size`({size}) argument(s)")]
+    #[diagnostic(
+        code(espflash::erase_region::invalid_argument),
+        help("`address` and `size` must be multiples of 0x1000 (4096)")
+    )]
+    InvalidEraseRegionArgument { address: u32, size: u32 },
 }
 
 #[cfg(feature = "serialport")]

espflash/tests/scripts/erase-region.sh

@@ -1,5 +1,30 @@
 #!/usr/bin/env bash
 
+# Function to check expected failure for unaligned erase arguments
+check_unaligned_erase() {
+    local address=$1
+    local size=$2
+    result=$(espflash erase-region "$address" "$size" 2>&1)
+    echo "$result"
+    
+    if [[ $result =~ "Invalid `address`" ]]; then
+        echo "Unaligned erase correctly rejected: address=$address, size=$size"
+    else
+        echo "Test failed: unaligned erase was not rejected!"
+        exit 1
+    fi
+}
+
+# Unaligned address (not a multiple of 4096)
+check_unaligned_erase 0x1001 0x1000
+
+# Unaligned size (not a multiple of 4096)
+check_unaligned_erase 0x1000 0x1001
+
+# Both address and size unaligned
+check_unaligned_erase 0x1003 0x1005
+
+# Valid erase - should succeed
 result=$(espflash erase-region 0x1000 0x1000 2>&1)
 echo "$result"
 if [[ ! $result =~ "Erasing region at" ]]; then