summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 18:11:51 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 18:11:51 +0000
commitf6ab961f67d76245bed7efdf1705f73b5f87a093 (patch)
tree1833c5db7ef1611aa0cdf7a1158e8e3e7845862a /target
parent6f27fcc4b043a77ea7c6ae04f6177f65620e2cc0 (diff)
ar71xx: verify hardware id of firmware images on TP-Link boards
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29455 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh10
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh16
2 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index bb6ceb706..ca0799d1b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -48,6 +48,16 @@ wndr3700_board_detect() {
AR71XX_MODEL="$machine"
}
+tplink_get_hwid() {
+ local part
+ local hwid
+
+ part=$(find_mtd_part firmware)
+ [ -z "$part" ] && return 1
+
+ dd if=$part bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
ar71xx_board_detect() {
local machine
local name
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 8b69bc59a..d2780a50a 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -61,6 +61,10 @@ platform_do_upgrade_combined() {
fi
}
+tplink_get_image_hwid() {
+ get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
platform_check_image() {
local board=$(ar71xx_board_name)
local magic="$(get_magic_word "$1")"
@@ -125,6 +129,18 @@ platform_check_image() {
echo "Invalid image type."
return 1
}
+
+ local hwid
+ local imageid
+
+ hwid=$(tplink_get_hwid)
+ imageid=$(tplink_get_image_hwid "$1")
+
+ [ "$hwid" != "$imageid" ] && {
+ echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
+ return 1
+ }
+
return 0
;;
wndr3700)