diff mbox

UBI: fix use of "VID" vs. "EC" in header self-check

Message ID 1448057454-32664-1-git-send-email-computersforpeace@gmail.com
State Accepted
Delegated to: Richard Weinberger
Headers show

Commit Message

Brian Norris Nov. 20, 2015, 10:10 p.m. UTC
Looks like a typo, using UBI_EC_HDR_SIZE_CRC (note the "EC") to compute
the CRC for the VID header.

This shouldn't cause any functional change, as both structures are 64
bytes. Verified with:

	BUILD_BUG_ON(UBI_VID_HDR_SIZE_CRC != UBI_EC_HDR_SIZE_CRC);

Reported here:
http://lists.infradead.org/pipermail/linux-mtd/2013-September/048570.html

Reported by: Bill Pringlemeir <bpringlemeir@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
I was sorting through really old email. Don't ask.

 drivers/mtd/ubi/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Weinberger Nov. 20, 2015, 10:15 p.m. UTC | #1
Am 20.11.2015 um 23:10 schrieb Brian Norris:
> Looks like a typo, using UBI_EC_HDR_SIZE_CRC (note the "EC") to compute
> the CRC for the VID header.
> 
> This shouldn't cause any functional change, as both structures are 64
> bytes. Verified with:
> 
> 	BUILD_BUG_ON(UBI_VID_HDR_SIZE_CRC != UBI_EC_HDR_SIZE_CRC);
> 
> Reported here:
> http://lists.infradead.org/pipermail/linux-mtd/2013-September/048570.html
> 
> Reported by: Bill Pringlemeir <bpringlemeir@gmail.com>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> ---
> I was sorting through really old email. Don't ask.

Patch looks good, thanks for the exhumation! ;)

Thanks,
//richard
diff mbox

Patch

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 1fc23e48fe8e..10cf3b549959 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1299,7 +1299,7 @@  static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
 	if (err && err != UBI_IO_BITFLIPS && !mtd_is_eccerr(err))
 		goto exit;
 
-	crc = crc32(UBI_CRC32_INIT, vid_hdr, UBI_EC_HDR_SIZE_CRC);
+	crc = crc32(UBI_CRC32_INIT, vid_hdr, UBI_VID_HDR_SIZE_CRC);
 	hdr_crc = be32_to_cpu(vid_hdr->hdr_crc);
 	if (hdr_crc != crc) {
 		ubi_err(ubi, "bad VID header CRC at PEB %d, calculated %#08x, read %#08x",