diff options
| author |   Andreas Persson <andreasp56@outlook.com> | 2021-07-12 09:54:52 +0200 |
|---|---|---|
| committer |   Miquel Raynal <miquel.raynal@bootlin.com> | 2021-07-16 00:49:22 +0200 |
| commit | 2394e628738933aa014093d93093030f6232946d (patch) | |
| tree | 518f2adddf0cb3f9c5a68de698092691d10b23b9 /drivers/mtd/chips/cfi_cmdset_0002.c | |
| parent | mtd: core: handle flashes without OTP gracefully (diff) | |
| download | linux-dev-2394e628738933aa014093d93093030f6232946d.tar.xz linux-dev-2394e628738933aa014093d93093030f6232946d.zip | |
mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards
Erasing an AMD linear flash card (AM29F016D) crashes after the first
sector has been erased. Likewise, writing to it crashes after two bytes
have been written. The reason is a missing check for a null pointer -
the cmdset_priv field is not set for this type of card.
Fixes: 4844ef80305d ("mtd: cfi_cmdset_0002: Add support for polling status register")
Signed-off-by: Andreas Persson <andreasp56@outlook.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/DB6P189MB05830B3530B8087476C5CFE4C1159@DB6P189MB0583.EURP189.PROD.OUTLOOK.COM
Diffstat (limited to '')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 3097e93787f7..a761134fd3be 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -119,7 +119,7 @@ static int cfi_use_status_reg(struct cfi_private *cfi) struct cfi_pri_amdstd *extp = cfi->cmdset_priv; u8 poll_mask = CFI_POLL_STATUS_REG | CFI_POLL_DQ; - return extp->MinorVersion >= '5' && + return extp && extp->MinorVersion >= '5' && (extp->SoftwareFeatures & poll_mask) == CFI_POLL_STATUS_REG; } |