diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
commit | 8985573ad66c9fb011910a352b8c1427ee08ded3 (patch) | |
tree | 86eaba30b6363eeaba0d196f4e88d85958dc0e40 /scripts | |
parent | 57c475b48dcf8e41ddaaa77686ea41adb9049dc5 (diff) | |
parent | ec4dca17bb6a0029466de80754a20fec13d0e111 (diff) | |
download | barebox-8985573ad66c9fb011910a352b8c1427ee08ded3.tar.gz barebox-8985573ad66c9fb011910a352b8c1427ee08ded3.tar.xz |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kwboot.c | 63 |
1 files changed, 53 insertions, 10 deletions
diff --git a/scripts/kwboot.c b/scripts/kwboot.c index db177ceb5f..df52144e45 100644 --- a/scripts/kwboot.c +++ b/scripts/kwboot.c @@ -602,12 +602,24 @@ out: return rc; } +static unsigned char crc(const unsigned char *img, size_t len) +{ + unsigned char ret = 0; + size_t i; + + for (i = 0; i < len; ++i) + ret += img[i]; + + return ret; +} + static int kwboot_check_image(unsigned char *img, size_t size) { size_t i; size_t header_size, image_size, image_offset; unsigned char csum = 0; + unsigned char imgversion; if (size < 0x20) { fprintf(stderr, @@ -636,7 +648,8 @@ kwboot_check_image(unsigned char *img, size_t size) return 1; } - if (img[0x8] != 1) { + imgversion = img[0x8]; + if (imgversion > 1) { fprintf(stderr, "Unknown version: 0x%hhx\n", img[0x8]); return 1; } @@ -646,7 +659,15 @@ kwboot_check_image(unsigned char *img, size_t size) image_offset = img[0xc] | (img[0xd] << 8) | (img[0xe] << 16) | (img[0xf] << 24); - header_size = (img[0x9] << 16) | img[0xa] | (img[0xb] << 8); + if (imgversion == 0) { + /* Image format 0 */ + header_size = + img[0x1e] * 0x200 /* header extensions */ + + img[0x1d] * 0x800 /* binary header extensions */; + } else { + /* Image format 1 */ + header_size = (img[0x9] << 16) | img[0xa] | (img[0xb] << 8); + } if (header_size > image_offset) { fprintf(stderr, "Header (%zu) expands over image start (%zu)\n", @@ -660,16 +681,38 @@ kwboot_check_image(unsigned char *img, size_t size) return 1; } - for (i = 0; i < header_size; ++i) - csum += img[i]; - csum -= img[0x1f]; + if (imgversion == 0) { + /* check Main Header */ + csum = crc(img, 0x1f); + if (csum != img[0x1f]) { + fprintf(stderr, + "Main Header checksum mismatch: specified: 0x%02hhx, calculated: 0x%02hhx\n", + img[0x1f], csum); + return 1; + } + + /* check Header Extensions */ + for (i = 0; i < img[0x1e]; ++i) { + csum = crc(img + 0x20 + i * 0x200, 0x1df); + if (csum != img[i * 0x200 + 0x1ff]) { + fprintf(stderr, + "Extension Header #%zu checksum mismatch: specified: 0x%02hhx, calculated: 0x%02hhx\n", + i, img[i * 0x200 + 0x1ff], csum); + return 1; + } + } + } else { + csum = crc(img, header_size); + csum -= img[0x1f]; + + if (csum != img[0x1f]) { + fprintf(stderr, + "Checksum mismatch: specified: 0x%02hhx, calculated: 0x%02hhx\n", + img[0x1f], csum); + return 1; + } - if (csum != img[0x1f]) { - fprintf(stderr, - "Checksum mismatch: specified: 0x%02hhx, calculated: 0x%02hhx\n", - img[0x1f], csum); - return 1; } return 0; |