mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

bcm4908img: detect Linksys images 

Linksys uses an extra 0x100 bytes long tail for BCM4908 images.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit c4d5e60f61)
This commit is contained in:
Rafał Miłecki 2021-09-10 16:34:48 +02:00
parent 1d1c695273
commit 2c1f27bf4b
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/utils/bcm4908img/Makefile
View File

@ -3,7 +3,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=bcm4908img PKG_NAME:=bcm4908img
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared

22
package/utils/bcm4908img/src/bcm4908img.c
View File

@ -77,6 +77,7 @@ struct bcm4908img_tail {
* 4. padding ├─ firmware * 4. padding ├─ firmware
* 5. rootfs ─┘ * 5. rootfs ─┘
* 6. BCM4908 tail * 6. BCM4908 tail
* 7. (Optional) vendor tail
*/ */
struct bcm4908img_info { struct bcm4908img_info {
size_t cferom_offset; size_t cferom_offset;
@ -249,6 +250,16 @@ struct chk_header {
char board_id[0]; char board_id[0];
}; };
struct linksys_tail {
char magic[9];
uint8_t version[8];
char model[15];
uint32_t crc32;
uint8_t padding[9];
uint8_t signature[16];
uint8_t reserved[192];
};
static bool bcm4908img_is_all_ff(const void *buf, size_t length) static bool bcm4908img_is_all_ff(const void *buf, size_t length)
{ {
const uint8_t *in = buf; const uint8_t *in = buf;
@ -264,6 +275,7 @@ static bool bcm4908img_is_all_ff(const void *buf, size_t length)
static int bcm4908img_parse(FILE *fp, struct bcm4908img_info *info) { static int bcm4908img_parse(FILE *fp, struct bcm4908img_info *info) {
struct bcm4908img_tail *tail = &info->tail; struct bcm4908img_tail *tail = &info->tail;
struct linksys_tail *linksys;
struct chk_header *chk; struct chk_header *chk;
struct stat st; struct stat st;
uint8_t buf[1024]; uint8_t buf[1024];
@ -297,6 +309,16 @@ static int bcm4908img_parse(FILE *fp, struct bcm4908img_info *info) {
if (be32_to_cpu(chk->magic) == 0x2a23245e) if (be32_to_cpu(chk->magic) == 0x2a23245e)
info->cferom_offset = be32_to_cpu(chk->header_len); info->cferom_offset = be32_to_cpu(chk->header_len);
fseek(fp, -sizeof(buf), SEEK_END);
if (fread(buf, 1, sizeof(buf), fp) != sizeof(buf)) {
fprintf(stderr, "Failed to read file header\n");
return -EIO;
}
linksys = (void *)(buf + sizeof(buf) - sizeof(*linksys));
if (!memcmp(linksys->magic, ".LINKSYS.", sizeof(linksys->magic))) {
info->tail_offset -= sizeof(*linksys);
}
/* Offsets */ /* Offsets */
for (info->bootfs_offset = info->cferom_offset; for (info->bootfs_offset = info->cferom_offset;