mirror of https://github.com/hak5/openwrt.git
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
parent
79d02229cc
commit
dfed41d3d8
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue