aboutsummaryrefslogtreecommitdiffstats
path: root/package/system/mtd/src/trx.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-05-06 14:37:05 +0200
committerRafał Miłecki <zajec5@gmail.com>2016-05-09 20:10:58 +0200
commitdf8ca9a5c4d87903ddca15d1a6c60f43b15656fe (patch)
treedb5d218c753ecf0742bdb961ce27939f39e7aa19 /package/system/mtd/src/trx.c
parent2dd125048dedbae3fbad6ae4b89f4b9b6e44b9b1 (diff)
downloadupstream-df8ca9a5c4d87903ddca15d1a6c60f43b15656fe.tar.gz
upstream-df8ca9a5c4d87903ddca15d1a6c60f43b15656fe.tar.bz2
upstream-df8ca9a5c4d87903ddca15d1a6c60f43b15656fe.zip
mtd: add -c option for specifying amount of data to be used for checksum
So far fixtrx was calculating checksum over amount of data matching partition erase size. It was mostly a workaround of checksum problem after changing anything in initial TRX content (e.g. formatting JFFS2). Its main purpose was to make bootloader accept modified TRX. This didn't provide much protection of flash data against corruption. This new option lets caller request calculating checksum over a bigger amount of data. It may be used e.g. to include whole kernel data for checksum and hopefully make bootloader go info failsafe mode if something goes wrong. Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'package/system/mtd/src/trx.c')
-rw-r--r--package/system/mtd/src/trx.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/package/system/mtd/src/trx.c b/package/system/mtd/src/trx.c
index f310f51087..816f0eba5f 100644
--- a/package/system/mtd/src/trx.c
+++ b/package/system/mtd/src/trx.c
@@ -36,6 +36,8 @@
#include "crc32.h"
#define TRX_MAGIC 0x30524448 /* "HDR0" */
+#define TRX_CRC32_DATA_OFFSET 12 /* First 12 bytes are not covered by CRC32 */
+#define TRX_CRC32_DATA_SIZE 16
struct trx_header {
uint32_t magic; /* "HDR0" */
uint32_t len; /* Length of file including header */
@@ -148,8 +150,9 @@ trx_check(int imagefd, const char *mtd, char *buf, int *len)
#endif
int
-mtd_fixtrx(const char *mtd, size_t offset)
+mtd_fixtrx(const char *mtd, size_t offset, size_t data_size)
{
+ size_t data_offset;
int fd;
struct trx_header *trx;
char *first_block;
@@ -166,10 +169,16 @@ mtd_fixtrx(const char *mtd, size_t offset)
exit(1);
}
+ data_offset = offset + TRX_CRC32_DATA_OFFSET;
+ if (data_size)
+ data_size += TRX_CRC32_DATA_SIZE;
+ else
+ data_size = erasesize - TRX_CRC32_DATA_OFFSET;
+
block_offset = offset & ~(erasesize - 1);
offset -= block_offset;
- if (block_offset + erasesize > mtdsize) {
+ if (data_offset + data_size > mtdsize) {
fprintf(stderr, "Offset too large, device size 0x%x\n", mtdsize);
exit(1);
}
@@ -192,28 +201,28 @@ mtd_fixtrx(const char *mtd, size_t offset)
exit(1);
}
- if (trx->len == STORE32_LE(erasesize - offset)) {
+ if (trx->len == STORE32_LE(data_size + TRX_CRC32_DATA_OFFSET)) {
if (quiet < 2)
fprintf(stderr, "Header already fixed, exiting\n");
close(fd);
return 0;
}
- buf = malloc(erasesize);
+ buf = malloc(data_size);
if (!buf) {
perror("malloc");
exit(1);
}
- res = pread(fd, buf, erasesize, block_offset);
- if (res != erasesize) {
+ res = pread(fd, buf, data_size, data_offset);
+ if (res != data_size) {
perror("pread");
exit(1);
}
- trx->len = STORE32_LE(erasesize - offset);
+ trx->len = STORE32_LE(data_size + offsetof(struct trx_header, flag_version));
- trx->crc32 = STORE32_LE(crc32buf((char*) &trx->flag_version, erasesize - offset - 3*4));
+ trx->crc32 = STORE32_LE(crc32buf(buf, data_size));
if (mtd_erase_block(fd, block_offset)) {
fprintf(stderr, "Can't erease block at 0x%x (%s)\n", block_offset, strerror(errno));
exit(1);