Linux kbuild/kconfig development
 help / color / mirror / Atom feed
* [PATCH] scripts: add zboot support to extract-vmlinux
@ 2025-05-22 17:29 Jeremy Linton
  2025-05-22 23:10 ` Nathan Chancellor
  2025-06-07 16:04 ` Masahiro Yamada
  0 siblings, 2 replies; 10+ messages in thread
From: Jeremy Linton @ 2025-05-22 17:29 UTC (permalink / raw)
  To: linux-kbuild
  Cc: masahiroy, nathan, nicolas.schier, linux-kernel, Jeremy Linton,
	Ard Biesheuvel

Zboot compressed kernel images are used for arm kernels on various
distros.

extract-vmlinux fails with those kernels because the wrapped image is
another PE. While this could be a bit confusing, the tools primary
purpose of unwrapping and decompressing the contained vmlinux image
makes it the obvious place for this functionality.

Add a 'file' check in check_vmlinux() that detects a contained PE
image before trying readelf. Recent file implementations output
something like:

"Linux kernel ARM64 boot executable Image, little-endian, 4K pages"

Which is also a stronger statement than readelf provides so drop that
part of the comment. At the same time this means that kernel images
which don't appear to contain a compressed image will be returned
rather than reporting an error. Which matches the behavior for
existing ELF files.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
---
 scripts/extract-vmlinux | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
index 8995cd304e6e..edda1abe226c 100755
--- a/scripts/extract-vmlinux
+++ b/scripts/extract-vmlinux
@@ -12,10 +12,11 @@
 
 check_vmlinux()
 {
-	# Use readelf to check if it's a valid ELF
-	# TODO: find a better to way to check that it's really vmlinux
-	#       and not just an elf
-	readelf -h $1 > /dev/null 2>&1 || return 1
+	file $1 |grep 'Linux kernel.*boot executable Image' > /dev/null
+	if [ "$?" -ne "0" ]; then
+		# Use readelf to check if it's a valid ELF, if 'file' fails
+		readelf -h $1 > /dev/null 2>&1 || return 1
+	fi
 
 	cat $1
 	exit 0
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2025-07-08 21:30 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-22 17:29 [PATCH] scripts: add zboot support to extract-vmlinux Jeremy Linton
2025-05-22 23:10 ` Nathan Chancellor
2025-05-23 15:03   ` Jeremy Linton
2025-06-07 16:04 ` Masahiro Yamada
2025-06-16 16:07   ` Jeremy Linton
2025-06-24 17:56     ` Masahiro Yamada
2025-07-07 21:29       ` Jeremy Linton
2025-07-07 23:35         ` Masahiro Yamada
2025-07-08 21:30           ` Jeremy Linton
2025-07-07 21:31       ` Jeremy Linton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox