block: Fix incorrect boundary check for erase

andoma · andoma · commit 2da22021bbe4 · 2025-12-09T08:17:36.000+01:00
diff --git a/src/util/block.c b/src/util/block.c
@@ -19,9 +19,10 @@ static error_t
 partition_erase(struct block_iface *bi, size_t block, size_t count)
 {
   partition_t *p = (partition_t *)bi;
-  block += p->offset;
-  if (block + count > p->iface.num_blocks)
+  if (block + count > p->iface.num_blocks) {
     return ERR_NOSPC;
+  }
+  block += p->offset;
   return p->parent->erase(p->parent, block, count);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ static error_t`
`19`	`19`	`partition_erase(struct block_iface *bi, size_t block, size_t count)`
`20`	`20`	`{`
`21`	`21`	`partition_t p = (partition_t )bi;`
`22`		`- block += p->offset;`
`23`		`- if (block + count > p->iface.num_blocks)`
	`22`	`+ if (block + count > p->iface.num_blocks) {`
`24`	`23`	`return ERR_NOSPC;`
	`24`	`+ }`
	`25`	`+ block += p->offset;`
`25`	`26`	`return p->parent->erase(p->parent, block, count);`
`26`	`27`	`}`
`27`	`28`