From 0c1d881cd6e67700c8f6f767eb2c59528352370c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 9 May 2016 12:54:46 +0000 Subject: [PATCH] mtd: seama: update MD5 using header in the first block buffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This will allow separating first block buffer from a buffer used for MD5 calculation. Signed-off-by: Rafał Miłecki Backport of r49307 SVN-Revision: 49311 --- package/system/mtd/src/seama.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/system/mtd/src/seama.c b/package/system/mtd/src/seama.c index 42b1e88e08..b51177ac87 100644 --- a/package/system/mtd/src/seama.c +++ b/package/system/mtd/src/seama.c @@ -51,9 +51,8 @@ ssize_t pread(int fd, void *buf, size_t count, off_t offset); ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset); int -seama_fix_md5(char *buf, size_t len) +seama_fix_md5(struct seama_entity_header *shdr, char *buf, size_t len) { - struct seama_entity_header *shdr = (struct seama_entity_header *) buf; char *data; size_t msize; size_t isize; @@ -163,7 +162,7 @@ mtd_fixseama(const char *mtd, size_t offset) exit(1); } - if (seama_fix_md5(buf, mtdsize)) + if (seama_fix_md5(shdr, buf, mtdsize)) goto out; if (mtd_erase_block(fd, block_offset)) { @@ -175,7 +174,7 @@ mtd_fixseama(const char *mtd, size_t offset) if (quiet < 2) fprintf(stderr, "Rewriting block at 0x%x\n", block_offset); - if (pwrite(fd, buf, erasesize, block_offset) != erasesize) { + if (pwrite(fd, first_block, erasesize, block_offset) != erasesize) { fprintf(stderr, "Error writing block (%s)\n", strerror(errno)); exit(1); } -- 2.30.2