aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-26 19:08:28 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-26 19:08:28 +0000
commitffed7530534c607700b7a8f9ae2cb35ab4e32fe6 (patch)
treedb7e2289c8e64370cd9f4fbae6a28dea20b661ff /target
parenta5757e93e4841eb14ebd9418145d096c688f8448 (diff)
downloadopenwrt-ffed7530534c607700b7a8f9ae2cb35ab4e32fe6.tar.gz
openwrt-ffed7530534c607700b7a8f9ae2cb35ab4e32fe6.zip
AA: ar71xx: reject TP-Link images containing a bootloader
Backport of r33944. The original TP-Link firmware images can be flashed via the sysupgrade command, however those may contain a bootloader. Flashing such an image via sysupgrade bricks the board, and it can't be recovered without a serial console. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33948 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 066bfd414..f1d95f6f6 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -65,6 +65,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_boot_size() {
+ get_image "$@" | dd bs=4 count=1 skip=37 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")"
@@ -174,6 +178,14 @@ platform_check_image() {
return 1
}
+ local boot_size
+
+ boot_size=$(tplink_get_image_boot_size "$1")
+ [ "$boot_size" != "00000000" ] && {
+ echo "Invalid image, it contains a bootloader."
+ return 1
+ }
+
return 0
;;
wndr3700)