RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-14 02:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

base-files: fix sysupgrade for kernel-out-of-UBI

Browse Source 
Commit ecbcc0b595 bricks devices on which the raw kernel and UBI mtd
partitions overlap.

This is the case of the ZyXEL NR7101 for example. Its OEM bootloader has
no UBI support. OpenWrt splits the stock kernel mtd partition into a raw
kernel part used by the bootloader and a UBI part used to store rootfs
and rootfs_data. Running mtd erase on the complete partition during
sysupgrade erases the UBI part and results in a soft brick.

Arguably the best solution would be to fix the partition layouts so that
kernel and UBI partitions do not overlap, also including a stock_kernel
partition to help reverting to stock firmware. This would have the added
benefit of protecting UBI from kernel images that are excessively large.

Fixes: ecbcc0b595 ("base-files: safer sysupgrade.tar for kernel-out-of-UBI")
Reported-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
This commit is contained in:
Rodrigo Balerdi 2022-05-02 05:33:01 -03:00 committed by Daniel Golle
parent 4e8d095013
commit 7d02fc0951
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/base-files/files/lib/upgrade/nand.sh
View File

@ -305,7 +305,11 @@ nand_upgrade_tar() {
local ubi_kernel_length local ubi_kernel_length
if [ "$kernel_length" ]; then if [ "$kernel_length" ]; then
if [ "$kernel_mtd" ]; then if [ "$kernel_mtd" ]; then
mtd erase "$CI_KERNPART" # On some devices, the raw kernel and ubi partitions overlap.
# These devices brick if the kernel partition is erased.
# Hence only invalidate kernel for now.
dd if=/dev/zero bs=4096 count=1 2>/dev/null | \
mtd write - "$CI_KERNPART"
else else
ubi_kernel_length="$kernel_length" ubi_kernel_length="$kernel_length"
fi fi
@ -322,7 +326,7 @@ nand_upgrade_tar() {
if [ "$kernel_length" ]; then if [ "$kernel_length" ]; then
if [ "$kernel_mtd" ]; then if [ "$kernel_mtd" ]; then
tar xf "$tar_file" "$board_dir/kernel" -O | \ tar xf "$tar_file" "$board_dir/kernel" -O | \
mtd -n write - "$CI_KERNPART" mtd write - "$CI_KERNPART"
else else
local kern_ubivol="$( nand_find_volume $ubidev "$CI_KERNPART" )" local kern_ubivol="$( nand_find_volume $ubidev "$CI_KERNPART" )"
tar xf "$tar_file" "$board_dir/kernel" -O | \ tar xf "$tar_file" "$board_dir/kernel" -O | \