From: rmilecki <rmilecki@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 21 Apr 2015 11:21:34 +0000 (+0000)
Subject: bcm53xx: sysupgrade: check if new kernel fits partition size
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=ed2c76f15ba7bc56df88e9898b6bd7be2a7e7e04;p=openwrt.git

bcm53xx: sysupgrade: check if new kernel fits partition size

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45547 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index e53c2513d2..88629549dc 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -152,12 +152,17 @@ platform_pre_upgrade() {
 		echo "Unable to find \"linux\" partition size"
 		exit 1
 	}
-	linux_length=$((0x$linux_length + 28))
+	linux_length=$((0x$linux_length))
+	local kernel_length=$(wc -c $dir/kernel | cut -d ' ' -f 1)
+	[ $kernel_length -gt $linux_length ] && {
+		echo "New kernel doesn't fit \"linux\" partition."
+		return
+	}
 	rm -f /tmp/null.bin
 	rm -f /tmp/kernel.trx
 	touch /tmp/null.bin
 	otrx create /tmp/kernel.trx \
-		-f $dir/kernel -b $linux_length \
+		-f $dir/kernel -b $(($linux_length + 28)) \
 		-f /tmp/null.bin
 
 	# Prepare UBI image (drop unwanted extra blocks)