From: rmilecki <rmilecki@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 9 May 2016 12:53:33 +0000 (+0000)
Subject: mtd: seama: update MD5 using header in the first block buffer
X-Git-Tag: v17.01.0-rc1~2934
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d628f0cbe7e4ccc2eccb7b52597548f76fe302e;p=oweals%2Fopenwrt.git

mtd: seama: update MD5 using header in the first block buffer

This will allow separating first block buffer from a buffer used for MD5
calculation.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---

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);
 	}