diff options
| author | John Crispin <john@openwrt.org> | 2016-04-01 07:11:53 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-04-01 07:11:53 +0000 |
| commit | dfed41d3d805e9383ff4c9dd184a0e5d4046e617 (patch) | |
| tree | d2603e6a16bba111052a31405b78658be1f6ea45 /target/linux/ar71xx/base-files | |
| parent | 79d02229cc12c415007ec4346425016622ec449b (diff) | |
| download | upstream-dfed41d3d805e9383ff4c9dd184a0e5d4046e617.tar.gz upstream-dfed41d3d805e9383ff4c9dd184a0e5d4046e617.tar.bz2 upstream-dfed41d3d805e9383ff4c9dd184a0e5d4046e617.zip | |
ar71xx: check both HWID and HWREV on upgrades of TP-LINK devices
There's no reason for us to be more lenient than the stock firmware, so
better check the HWREV as well to avoid bricked devices.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 49105
Diffstat (limited to 'target/linux/ar71xx/base-files')
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 1d3695f372..923e02b9fc 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -66,6 +66,10 @@ tplink_get_image_hwid() { get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } +tplink_get_image_mid() { + get_image "$@" | dd bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' +} + tplink_get_image_boot_size() { get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } @@ -396,13 +400,17 @@ platform_check_image() { } local hwid - local imageid + local mid + local imagehwid + local imagemid hwid=$(tplink_get_hwid) - imageid=$(tplink_get_image_hwid "$1") + mid=$(tplink_get_mid) + imagehwid=$(tplink_get_image_hwid "$1") + imagemid=$(tplink_get_image_mid "$1") - [ "$hwid" != "$imageid" ] && { - echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid." + [ "$hwid" != "$imagehwid" -o "$mid" != "$imagemid" ] && { + echo "Invalid image, hardware ID mismatch, hw:$hwid $mid image:$imagehwid $imagemid." return 1 } |