183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware-utils/tplink-safeloader: soft-version magic is data length

Browse Source 
The soft-version partition actually contains a header and trailing data:
* header: {data length, [zero]}
* data: {version, bcd encoded date, revision}

The data length is currently treated as a magic number, but should
contain the length of the partition data.

This header is also present the following partitions (non-exhaustive):
* string-based soft-version
* support-list

Signed-off-by: Sander Vanheule <sander@svanheule.net>
This commit is contained in:
Sander Vanheule 2020-07-11 22:58:07 +02:00 committed by Stijn Tintel
parent b71668f96a
commit 6985a26e59
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/firmware-utils/src/tplink-safeloader.c
View File

@ -84,7 +84,7 @@ struct device_info {
/** The content of the soft-version structure */
struct __attribute__((__packed__)) soft_version {
uint32_t magic;
uint32_t data_len;
uint32_t zero;
uint8_t pad1;
uint8_t version_major;
@ -2153,7 +2153,8 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
struct tm *tm = gmtime(&t);
s->magic = htonl(0x0000000c);
/* Partition contents size, minus 8 byte header and trailing byte */
s->data_len = htonl(entry.size-9);
s->zero = 0;
s->pad1 = 0xff;