diff mbox series

mtd/ubi: Make sure to read volume record from LEB 0 or LEB 1

Message ID 1534745345-175434-1-git-send-email-liu.song11@zte.com.cn
State Superseded
Headers show
Series mtd/ubi: Make sure to read volume record from LEB 0 or LEB 1 | expand

Commit Message

Liu Song Aug. 20, 2018, 6:09 a.m. UTC 
From: fishland <liu.song11@zte.com.cn>

Even though we protect on-flash data by CRC checksums,
we still don't trust the media. If lnum is not 0 or 1,
access exceed array boundary can lead to bad situation.

Signed-off-by: Liu Song <liu.song11@zte.com.cn>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
---
 drivers/mtd/ubi/vtbl.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Richard Weinberger Aug. 20, 2018, 8:21 p.m. UTC | #1 
Lui Song,

Am Montag, 20. August 2018, 08:09:05 CEST schrieb Liu Song:
> From: fishland <liu.song11@zte.com.cn>

Please use your real name. 1st Signed-off-by and patch author should match.
 
> Even though we protect on-flash data by CRC checksums,
> we still don't trust the media. If lnum is not 0 or 1,
> access exceed array boundary can lead to bad situation.

Good find! I'll queue this for the next fixes-pull-request.

Thanks,
//richard
diff mbox series

Patch

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 94d7a86..64a2937 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -410,6 +410,10 @@  static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi,
 
 	/* Read both LEB 0 and LEB 1 into memory */
 	ubi_rb_for_each_entry(rb, aeb, &av->root, u.rb) {
+		if (aeb->lnum != 0 && aeb->lnum != 1) {
+			ubi_warn(ubi, "volume store in LEB %d", aeb->lnum);
+			continue;
+		}
 		leb[aeb->lnum] = vzalloc(ubi->vtbl_size);
 		if (!leb[aeb->lnum]) {
 			err = -ENOMEM;