From 0ea21d09bd447a984ef1de7c4cf27e6790c60198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Wed, 24 Mar 2021 21:45:08 +0100 Subject: [PATCH] fix: extract_kernel: don't overwrite kernel_err if already set Fixes #395 --- spectre-meltdown-checker.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index 12eb279..350fe24 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -1396,7 +1396,10 @@ extract_kernel() try_decompress '(\265/\375' xxy unzstd '' zstd "$1" "$mode" "$pass" && return 0 done done - kernel_err="kernel compression format is unknown or image is invalid" + # kernel_err might already have been populated by try_decompress() if we're missing one of the tools + if [ -z "$kernel_err" ]; then + kernel_err="kernel compression format is unknown or image is invalid" + fi _verbose "Couldn't extract the kernel image ($kernel_err), accuracy might be reduced" return 1 }