From: Rafał Miłecki Date: Tue, 23 Feb 2016 14:40:40 +0000 (+0000) Subject: kernel: mtdsplit: add missing digest field to Seama header X-Git-Tag: reboot~395 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a57ce0c03b8c33a69c3a87d537d1a61a666f046;p=oweals%2Fopenwrt.git kernel: mtdsplit: add missing digest field to Seama header Seama format has 2 similar headers: container (seal) header and entity header. The first one has size always set to 0 and doesn't contain MD5 digest. When dealing with Seama on a flash we deal directly with an entity. You can see mtdsplit_parse_seama reads from offset 0 and expects entity to be there. Seama container is used by bootloader / interface only which extract entity out of it and flash it. That said we should fix our header struct. This is important as we calculate possible rootfs offset assuming it may be placed right after Seama entity. So far calculate offset was always 16B too low. Signed-off-by: Rafał Miłecki SVN-Revision: 48754 --- diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c index f8ddee7ce0..ee0444a43e 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c @@ -26,6 +26,7 @@ struct seama_header { __be16 reserved; /* reserved for */ __be16 metasize; /* size of the META data */ __be32 size; /* size of the image */ + u8 md5[16]; /* digest */ }; static int mtdsplit_parse_seama(struct mtd_info *master,