KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: upgrade: make get_partitions() endian agnostic

Browse source 
This patch fixes two issues with the current get_partitions()
function.

First: "Invalid partition table on $disk" will pop up on
legitimate images on big endian system.

This is because the little-endian representation of "55 AA" is
assumed in the context of little-endian architectures. On these
comparing it to the 16-bit word 0xAA55 does work as intented.
Whereas on big-endian systems, this would have to be 0x55AA.

This patch fixes the issue by replacing the integer conversion
and value match check with just a string comparision.

Second: The extraction of the type, start LBA and LBA num from
the partition table has the same endianness issue. This has been
fixed by using the new hex_le32_to_cpu() function. This function
will translate the stored little-endian data to the correct
byte-order if necessary.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter 2017-11-19 17:19:21 +01:00 committed by Felix Fietkau
parent 96b485ec7a
commit 4e3f6dae04
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package/base-files/files/lib/upgrade/common.sh
View file

@ -160,6 +160,14 @@ export_partdevice() {
return 1 return 1
} }
hex_le32_to_cpu() {
[ "$(echo 01 | hexdump -v -n 2 -e '/2 "%x"')" == "3031" ] && {
echo "${1:0:2}${1:8:2}${1:6:2}${1:4:2}${1:2:2}"
return
}
echo "$@"
}
get_partitions() { # <device> <filename> get_partitions() { # <device> <filename>
local disk="$1" local disk="$1"
local filename="$2" local filename="$2"
@ -167,8 +175,8 @@ get_partitions() { # <device> <filename>
if [ -b "$disk" -o -f "$disk" ]; then if [ -b "$disk" -o -f "$disk" ]; then
v "Reading partition table from $filename..." v "Reading partition table from $filename..."
local magic="$(hexdump -v -n 2 -s 0x1FE -e '1/2 "0x%04X"' "$disk")" local magic=$(dd if="$disk" bs=2 count=1 skip=255 2>/dev/null)
if [ "$magic" != 0xAA55 ]; then if [ "$magic" != $'\x55\xAA' ]; then
v "Invalid partition table on $disk" v "Invalid partition table on $disk"
exit exit
fi fi
@ -179,9 +187,9 @@ get_partitions() { # <device> <filename>
for part in 1 2 3 4; do for part in 1 2 3 4; do
set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk") set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
local type="$(($1 % 256))" local type="$(( $(hex_le32_to_cpu $1) % 256))"
local lba="$(($2))" local lba="$(( $(hex_le32_to_cpu $2) ))"
local num="$(($3))" local num="$(( $(hex_le32_to_cpu $3) ))"
[ $type -gt 0 ] || continue [ $type -gt 0 ] || continue