Skip to contentSkip to conversation

spi: sf_ops: Check the return value from spi_flash_cmd_read_status()

PATCH New Fabio Estevam 2 participants 2 messages Nov 17, 2015 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 spi: sf_ops: Check the return value from spi_flash_cmd_read_status()

From: Fabio Estevam <[email protected]>

We should check the return value from spi_flash_cmd_read_status() and propagate it in the case of error.

This fixes a defect caught by Coverity.

---
Changes since v1:
- Use if (ret < 0) (Jagan)

 drivers/mtd/spi/sf_ops.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/mtd/spi/sf_ops.c +8 -2
index 384224d..6cc2d31 100644
@@ -663,8 +663,11 @@ int stm_lock(struct spi_flash *flash, u32 ofs, size_t len)
 	u8 status_old, status_new;
 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
 	u8 shift = ffs(mask) - 1, pow, val;
+	int ret;
 
-	spi_flash_cmd_read_status(flash, &status_old);
+	ret = spi_flash_cmd_read_status(flash, &status_old);
+	if (ret < 0)
+		return ret;
 
 	/* SPI NOR always locks to the end */
 	if (ofs + len != flash->size) {
@@ -714,8 +717,11 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
 	uint8_t status_old, status_new;
 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
 	u8 shift = ffs(mask) - 1, pow, val;
+	int ret;
 
-	spi_flash_cmd_read_status(flash, &status_old);
+	ret = spi_flash_cmd_read_status(flash, &status_old);
+	if (ret < 0)
+		return ret;
 
 	/* Cannot unlock; would unlock larger region than requested */
 	if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size,
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 spi: sf_ops: Check the return value from spi_flash_cmd_read_status()

Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

We should check the return value from spi_flash_cmd_read_status() and propagate it in the case of error.

This fixes a defect caught by Coverity.

---

Applied to u-boot-spi/master

thanks!

Signature · 1 line
Jagan | openedev.