mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-15 10:16:43 +07:00
mtd: spi-nor: Check all the bits written, not just the BP ones
Check that all the bits written in the write_sr_and_check() method match the status_new received value. Failing to write the other bits is dangerous too, extend the check. Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>
This commit is contained in:
parent
b0db77f5aa
commit
40b7d5cccc
@ -960,8 +960,7 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len)
|
||||
}
|
||||
|
||||
/* Write status register and ensure bits in mask match written values */
|
||||
static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new,
|
||||
u8 mask)
|
||||
static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@ -975,7 +974,7 @@ static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return ((nor->bouncebuf[0] & mask) != (status_new & mask)) ? -EIO : 0;
|
||||
return (nor->bouncebuf[0] != status_new) ? -EIO : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1774,7 +1773,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
if ((status_new & mask) < (status_old & mask))
|
||||
return -EINVAL;
|
||||
|
||||
return spi_nor_write_sr_and_check(nor, status_new, mask);
|
||||
return spi_nor_write_sr_and_check(nor, status_new);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1859,7 +1858,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
|
||||
if ((status_new & mask) > (status_old & mask))
|
||||
return -EINVAL;
|
||||
|
||||
return spi_nor_write_sr_and_check(nor, status_new, mask);
|
||||
return spi_nor_write_sr_and_check(nor, status_new);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user