aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-07 14:13:56 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-07 14:13:56 +0000
commita19b69a717e277fe517d71e50807c71b84ac9738 (patch)
treeb92c06cdd109094e361947655940c9ce0b038309
parente2b59e4dbc97a54333ae69ab9f694edb6fe9dcb0 (diff)
downloadupstream-a19b69a717e277fe517d71e50807c71b84ac9738.tar.gz
upstream-a19b69a717e277fe517d71e50807c71b84ac9738.tar.bz2
upstream-a19b69a717e277fe517d71e50807c71b84ac9738.zip
bcm53xx: compare provided firmware magic with device magic
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45290
-rw-r--r--target/linux/bcm53xx/base-files/lib/upgrade/platform.sh31
1 files changed, 29 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 3d911d1246..17456b6cda 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -6,6 +6,10 @@ get_magic_long_at() {
dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%02x"'
}
+platform_machine() {
+ cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1
+}
+
platform_flash_type() {
# On NAND devices "rootfs" is UBI volume, so won't be find in /proc/mtd
grep -q "\"rootfs\"" /proc/mtd && {
@@ -16,6 +20,16 @@ platform_flash_type() {
echo "nand"
}
+platform_expected_image() {
+ local machine=$(platform_machine)
+
+ case "$machine" in
+ "netgear,r6250v1") echo "chk U12H245T00_NETGEAR"; return;;
+ "netgear,r6300v2") echo "chk U12H240T00_NETGEAR"; return;;
+ "netgear,r8000") echo "chk U12H315T00_NETGEAR"; return;;
+ esac
+}
+
platform_identify() {
local magic
@@ -49,14 +63,21 @@ platform_check_image() {
}
local file_type=$(platform_identify "$1")
+ local magic
case "$file_type" in
"chk")
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_image)
echo "Found CHK image with device board_id $board_id"
+ [ -n "$dev_board_id" -a "chk $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"
@@ -66,8 +87,14 @@ platform_check_image() {
return 0
;;
"cybertan")
- local 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_image)
+ echo "Found CyberTAN image with device pattern: $pattern"
+
+ [ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && {
+ echo "Firmware pattern doesn't match device pattern ($dev_pattern)"
+ return 1
+ }
magic=$(get_magic_long_at "$1" 32)
[ "$magic" != "48445230" ] && {