bootutil: Fix boot_find_status leaving flash area open

de-nordic · utzig · commit ec6dac501011 · 2021-10-24T08:04:20.000-03:00
The commit fixes boot_find_status leaving flash area object in open
state on success.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
@@ -224,16 +224,16 @@ boot_find_status(int image_index, const struct flash_area **fap)
 
         off = boot_magic_off(*fap);
         rc = flash_area_read(*fap, off, magic, BOOT_MAGIC_SZ);
+        flash_area_close(*fap);
+
         if (rc != 0) {
-            flash_area_close(*fap);
             return rc;
         }
 
         if (memcmp(magic, boot_img_magic, BOOT_MAGIC_SZ) == 0) {
             return 0;
         }
 
-        flash_area_close(*fap);
     }
 
     /* If we got here, no magic was found */

Original file line number	Diff line number	Diff line change
`@@ -224,16 +224,16 @@ boot_find_status(int image_index, const struct flash_area **fap)`
`224`	`224`
`225`	`225`	`off = boot_magic_off(*fap);`
`226`	`226`	`rc = flash_area_read(*fap, off, magic, BOOT_MAGIC_SZ);`
	`227`	`+ flash_area_close(*fap);`
	`228`	`+`
`227`	`229`	`if (rc != 0) {`
`228`		`- flash_area_close(*fap);`
`229`	`230`	`return rc;`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`if (memcmp(magic, boot_img_magic, BOOT_MAGIC_SZ) == 0) {`
`233`	`234`	`return 0;`
`234`	`235`	`}`
`235`	`236`
`236`		`- flash_area_close(*fap);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`/* If we got here, no magic was found */`