iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: cfi_cmdset_0002: fix SEGV unlocking multiple chips

Browse Source 
commit 5fdfc3dbad upstream.

cfi_ppb_unlock() tries to relock all sectors that were locked before
unlocking the whole chip.
This locking used the chip start address + the FULL offset from the
first flash chip, thereby forming an illegal address. Fix that by using
the chip offset(adr).

Fixes: 1648eaaa15 ("mtd: cfi_cmdset_0002: Support Persistent Protection Bits (PPB) locking")
Cc: stable@vger.kernel.org
Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joakim Tjernlund
2018-06-06 12:13:28 +02:00
committed by Greg Kroah-Hartman
parent 552eacd58e
commit 0bf4e48c20
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/chips/cfi_cmdset_0002.c
View File

@ -2531,7 +2531,7 @@ static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
struct ppb_lock { struct ppb_lock {
struct flchip *chip; struct flchip *chip;
loff_t offset; unsigned long adr;
int locked; int locked;
}; };
@ -2667,7 +2667,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
*/ */
if ((adr < ofs) || (adr >= (ofs + len))) { if ((adr < ofs) || (adr >= (ofs + len))) {
sect[sectors].chip = &cfi->chips[chipnum]; sect[sectors].chip = &cfi->chips[chipnum];
sect[sectors].offset = offset; sect[sectors].adr = adr;
sect[sectors].locked = do_ppb_xxlock( sect[sectors].locked = do_ppb_xxlock(
map, &cfi->chips[chipnum], adr, 0, map, &cfi->chips[chipnum], adr, 0,
DO_XXLOCK_ONEBLOCK_GETLOCK); DO_XXLOCK_ONEBLOCK_GETLOCK);
@ -2711,7 +2711,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
*/ */
for (i = 0; i < sectors; i++) { for (i = 0; i < sectors; i++) {
if (sect[i].locked) if (sect[i].locked)
do_ppb_xxlock(map, sect[i].chip, sect[i].offset, 0, do_ppb_xxlock(map, sect[i].chip, sect[i].adr, 0,
DO_XXLOCK_ONEBLOCK_LOCK); DO_XXLOCK_ONEBLOCK_LOCK);
} }