From 48d5de6f84325f2895ae66830d82ce23e827ff6e Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Sun, 10 Jan 2010 01:33:31 +0200 Subject: ubiformat: always initialize seq number For some reasons sequence number was set to 0 in some case, which is wrong. Signed-off-by: Artem Bityutskiy --- ubi-utils/src/ubiformat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ubi-utils/src/ubiformat.c') diff --git a/ubi-utils/src/ubiformat.c b/ubi-utils/src/ubiformat.c index 3b0f49b..80f3a6d 100644 --- a/ubi-utils/src/ubiformat.c +++ b/ubi-utils/src/ubiformat.c @@ -912,7 +912,8 @@ int main(int argc, char * const argv[]) printf("yes\n"); } else ubigen_info_init(&ui, mtd.eb_size, mtd.min_io_size, 0, - si->vid_hdr_offs, args.ubi_ver, 0); + si->vid_hdr_offs, args.ubi_ver, + args.image_seq); normsg("use offsets %d and %d", ui.vid_hdr_offs, ui.data_offs); } -- cgit v1.2.3 From 2caf2c6fda66f1f09502245229230743dc20295b Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Sun, 10 Jan 2010 01:39:24 +0200 Subject: ubiformat: be consistent with sequence numbers This commit fixes a stupid an nasty bug. When we flash an UBI image, we do not change its sequence numbers. But when we format the rest of the PEBs (beyond the flashed image), we use a random (or specified via cmdline) sequence number. As a result, we have a broken flash format and UBI refuses it, because half of it has one sequence number, another half has a different one. What we have to do instead, we have to substitute image's sequence number with ours. Reported-by: Jeff Angielski Signed-off-by: Artem Bityutskiy Tested-by: Jeff Angielski --- ubi-utils/src/ubiformat.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ubi-utils/src/ubiformat.c') diff --git a/ubi-utils/src/ubiformat.c b/ubi-utils/src/ubiformat.c index 80f3a6d..2316d67 100644 --- a/ubi-utils/src/ubiformat.c +++ b/ubi-utils/src/ubiformat.c @@ -295,7 +295,8 @@ static void print_bad_eraseblocks(const struct mtd_dev_info *mtd, printf("\n"); } -static int change_ec(struct ubi_ec_hdr *hdr, long long ec) +static int change_ech(struct ubi_ec_hdr *hdr, uint32_t image_seq, + long long ec) { uint32_t crc; @@ -309,6 +310,7 @@ static int change_ec(struct ubi_ec_hdr *hdr, long long ec) return errmsg("bad CRC %#08x, should be %#08x\n", crc, be32_to_cpu(hdr->hdr_crc)); + hdr->image_seq = cpu_to_be32(image_seq); hdr->ec = cpu_to_be64(ec); crc = crc32(UBI_CRC32_INIT, hdr, UBI_EC_HDR_SIZE_CRC); hdr->hdr_crc = cpu_to_be32(crc); @@ -438,7 +440,8 @@ static int mark_bad(const struct mtd_dev_info *mtd, struct ubi_scan_info *si, in return consecutive_bad_check(eb); } -static int flash_image(const struct mtd_dev_info *mtd, struct ubi_scan_info *si) +static int flash_image(const struct mtd_dev_info *mtd, const struct ubigen_info *ui, + struct ubi_scan_info *si) { int fd, img_ebs, eb, written_ebs = 0, divisor; off_t st_size; @@ -518,7 +521,7 @@ static int flash_image(const struct mtd_dev_info *mtd, struct ubi_scan_info *si) fflush(stdout); } - err = change_ec((struct ubi_ec_hdr *)buf, ec); + err = change_ech((struct ubi_ec_hdr *)buf, ui->image_seq, ec); if (err) { errmsg("bad EC header at eraseblock %d of \"%s\"", written_ebs, args.image); @@ -918,7 +921,7 @@ int main(int argc, char * const argv[]) } if (args.image) { - err = flash_image(&mtd, si); + err = flash_image(&mtd, &ui, si); if (err < 0) goto out_free; -- cgit v1.2.3 From a67747b7a314e685085b62e8239442ea54959dbc Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Fri, 15 Jan 2010 19:04:21 +0200 Subject: ubiformat: boost version to 1.5 We fixed the sequence numbers bug, which is quite serious. Signed-off-by: Artem Bityutskiy --- ubi-utils/src/ubiformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubi-utils/src/ubiformat.c') diff --git a/ubi-utils/src/ubiformat.c b/ubi-utils/src/ubiformat.c index 2316d67..8ad5051 100644 --- a/ubi-utils/src/ubiformat.c +++ b/ubi-utils/src/ubiformat.c @@ -44,7 +44,7 @@ #include "crc32.h" #include "common.h" -#define PROGRAM_VERSION "1.4" +#define PROGRAM_VERSION "1.5" #define PROGRAM_NAME "ubiformat" /* The variables below are set by command line arguments */ -- cgit v1.2.3