aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-03-30 22:06:11 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-03-30 22:06:11 +0000
commitc81de32363ee9a8af8e4953ef9d8b1e7f0c90e0c (patch)
treed68c49af2e0c2a448d111a4b26fc196921d33a62 /target
parent2b715d9c701c243dc834ea298066374021291b56 (diff)
downloadupstream-c81de32363ee9a8af8e4953ef9d8b1e7f0c90e0c.tar.gz
upstream-c81de32363ee9a8af8e4953ef9d8b1e7f0c90e0c.tar.bz2
upstream-c81de32363ee9a8af8e4953ef9d8b1e7f0c90e0c.zip
brcm47xx: compare provided firmware magic with device magic
This makes sysupgrade reject firmware images for different devices. Right now only support for 2 sample devices is implemented. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45170 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/base-files/lib/upgrade/platform.sh36
1 files changed, 34 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index f96935bf59..815c26cd86 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -6,6 +6,26 @@ get_magic_long_at() {
dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
}
+platform_machine() {
+ grep "machine" /proc/cpuinfo | sed "s/.*:[ \t]*//"
+}
+
+platform_expected_chk_board_id() {
+ local machine=$(platform_machine)
+
+ case "$machine" in
+ "Netgear WNDR4000") echo "U12H181T00_NETGEAR"; return;;
+ esac
+}
+
+platform_expected_cybertan_pattern() {
+ local machine=$(platform_machine)
+
+ case "$machine" in
+ "Linksys E1000 V2.1") echo "E100"; return;;
+ esac
+}
+
brcm47xx_identify() {
local magic
@@ -41,8 +61,14 @@ platform_check_image() {
local header_len=$((0x$(get_magic_long_at "$1" 4)))
local board_id_len=$(($header_len - 40))
local board_id=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"')
+ local dev_board_id=$(platform_expected_chk_board_id)
echo "Found CHK image with device board_id $board_id"
+ [ -n "$dev_board_id" -a "$board_id" != "$dev_board_id" ] && {
+ echo "Firmware board_id doesn't match device board_id ($dev_board_id)"
+ return 1
+ }
+
magic=$(get_magic_long_at "$1" "$header_len")
[ "$magic" != "48445230" ] && {
echo "No valid TRX firmware in the CHK image"
@@ -52,8 +78,14 @@ platform_check_image() {
return 0
;;
"cybertan")
- magic=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
- echo "Found CyberTAN image with device magic: $magic"
+ local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
+ local dev_pattern=$(platform_expected_cybertan_pattern)
+ echo "Found CyberTAN image with device pattern: $pattern"
+
+ [ -n "$dev_pattern" -a "$pattern" != "$dev_pattern" ] && {
+ echo "Firmware pattern doesn't match device pattern ($dev_pattern)"
+ return 1
+ }
magic=$(get_magic_long_at "$1" 32)
[ "$magic" != "48445230" ] && {