| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | --- a/include/linux/bcm963xx_tag.h |
| 2 | +++ b/include/linux/bcm963xx_tag.h |
| 3 | @@ -92,8 +92,10 @@ struct bcm_tag { |
| 4 | __u32 rootfs_crc; |
| 5 | /* 224-227: CRC32 of kernel partition */ |
| 6 | __u32 kernel_crc; |
| 7 | - /* 228-235: Unused at present */ |
| 8 | - char reserved1[8]; |
| 9 | + /* 228-231: Unused at present */ |
| 10 | + char reserved1[4]; |
| 11 | + /* 222-235: Openwrt: real rootfs length */ |
| 12 | + __u32 real_rootfs_length; |
| 13 | /* 236-239: CRC32 of header excluding last 20 bytes */ |
| 14 | __u32 header_crc; |
| 15 | /* 240-255: Unused at present */ |
| 16 | --- a/drivers/mtd/parsers/parser_imagetag.c |
| 17 | +++ b/drivers/mtd/parsers/parser_imagetag.c |
| 18 | @@ -136,7 +136,8 @@ static int bcm963xx_parse_imagetag_parti |
| 19 | } else { |
| 20 | /* OpenWrt layout */ |
| 21 | rootfsaddr = kerneladdr + kernellen; |
| 22 | - rootfslen = spareaddr - rootfsaddr; |
| 23 | + rootfslen = buf->real_rootfs_length; |
| 24 | + spareaddr = rootfsaddr + rootfslen; |
| 25 | } |
| 26 | } else { |
| 27 | goto out; |