fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware-utils/tplink-safeloader: add compat level

Browse Source 
TP-Link has introduced a compatibility level to prevent certain
downgrades. This information is stored in the soft-version partition,
changing the data length from 0xc to 0x10.

To remain compatible with existing devices and not produce different
images, the image builder doesn't store a compatibility level if it is
zero.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
This commit is contained in:
Sander Vanheule 2020-07-11 23:06:54 +02:00 committed by AmadeusGhost
parent e201f383d6
commit 75f21773f3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ struct device_info {
const char *support_list;
char support_trail;
const char *soft_ver;
uint32_t soft_ver_compat_level;
struct flash_partition_entry partitions[MAX_PARTITIONS+1];
const char *first_sysupgrade_partition;
const char *last_sysupgrade_partition;
@ -95,7 +96,6 @@ struct __attribute__((__packed__)) soft_version {
uint8_t month;
uint8_t day;
uint32_t rev;
uint8_t pad2;
};
@ -2024,8 +2024,13 @@ static inline uint8_t bcd(uint8_t v) {
/** Generates the soft-version partition */
static struct image_partition_entry make_soft_version(uint32_t rev) {
struct image_partition_entry entry = alloc_image_partition("soft-version", sizeof(struct soft_version));
static struct image_partition_entry make_soft_version(struct device_info *info, uint32_t rev) {
size_t part_len = sizeof(struct soft_version);
if (info->soft_ver_compat_level > 0)
part_len += sizeof(uint32_t);
struct image_partition_entry entry =
alloc_image_partition("soft-version", part_len+1);
struct soft_version *s = (struct soft_version *)entry.data;
time_t t;
@ -2052,7 +2057,11 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
s->day = bcd(tm->tm_mday);
s->rev = htonl(rev);
s->pad2 = 0xff;
if (info->soft_ver_compat_level > 0)
*(uint32_t *)(entry.data + sizeof(struct soft_version)) =
htonl(info->soft_ver_compat_level);
entry.data[entry.size-1] = 0xff;
return entry;
}
@ -2364,7 +2373,7 @@ static void build_image(const char *output,
if (info->soft_ver)
parts[1] = make_soft_version_from_string(info->soft_ver);
else
parts[1] = make_soft_version(rev);
parts[1] = make_soft_version(info, rev);
parts[2] = make_support_list(info);
parts[3] = read_file("os-image", kernel_image, false, NULL);