diff options
| author | Richard Weinberger <richard@nod.at> | 2018-08-29 14:20:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-31 08:23:30 +0200 |
| commit | 1af6d26ac45d4010ddd82ea1a57ef53c82d276af (patch) | |
| tree | 37d8f0c82472b5bfcb1a8b4468a93b994d3de2bb | |
| parent | 63cf89fc518a044754f7c417abf31a675bba7835 (diff) | |
| download | barebox-1af6d26ac45d4010ddd82ea1a57ef53c82d276af.tar.gz barebox-1af6d26ac45d4010ddd82ea1a57ef53c82d276af.tar.xz | |
ubi: fastmap: Detect EBA mismatches on-the-fly
Now we have the machinery to detect EBA mismatches on-the-fly
by comparing the in-memory volume ID and LEB number with the found
VID header.
This helps to detect malfunction of Fastmap.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/ubi/eba.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index d29df1d155..3aae3029e5 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -479,6 +479,7 @@ static int check_mapping(struct ubi_device *ubi, struct ubi_volume *vol, int lnu { int err; struct ubi_vid_io_buf *vidb; + struct ubi_vid_hdr *vid_hdr; if (!ubi->fast_attach) return 0; @@ -516,6 +517,22 @@ static int check_mapping(struct ubi_device *ubi, struct ubi_volume *vol, int lnu *pnum, err); goto out_free; + } else { + int found_vol_id, found_lnum; + + ubi_assert(err == 0 || err == UBI_IO_BITFLIPS); + + vid_hdr = ubi_get_vid_hdr(vidb); + found_vol_id = be32_to_cpu(vid_hdr->vol_id); + found_lnum = be32_to_cpu(vid_hdr->lnum); + + if (found_lnum != lnum || found_vol_id != vol->vol_id) { + ubi_err(ubi, "EBA mismatch! PEB %i is LEB %i:%i instead of LEB %i:%i", + *pnum, found_vol_id, found_lnum, vol->vol_id, lnum); + ubi_ro_mode(ubi); + err = -EINVAL; + goto out_free; + } } set_bit(lnum, vol->checkmap); |