linux-kernel - [tip: x86/build] x86/build: Fix broken copy command in genimage.sh when making isoimage

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <174051477652.10177.16350027311540309473.tip-bot2@tip-bot2>
Date: Tue, 25 Feb 2025 20:19:36 -0000
From: "tip-bot2 for Nir Lichtman" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Nir Lichtman <nir@...htman.org>, Ingo Molnar <mingo@...nel.org>,
 "H. Peter Anvin" <hpa@...or.com>, Ard Biesheuvel <ardb@...nel.org>,
 Masahiro Yamada <yamada.masahiro@...ionext.com>,
 Michal Marek <michal.lkml@...kovi.net>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: x86/build] x86/build: Fix broken copy command in genimage.sh
 when making isoimage

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     e451630226bd09dc730eedb4e32cab1cc7155ae8
Gitweb:        https://git.kernel.org/tip/e451630226bd09dc730eedb4e32cab1cc7155ae8
Author:        Nir Lichtman <nir@...htman.org>
AuthorDate:    Fri, 10 Jan 2025 12:05:00 
Committer:     Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 25 Feb 2025 21:13:33 +01:00

x86/build: Fix broken copy command in genimage.sh when making isoimage

Problem: Currently when running the "make isoimage" command there is an
error related to wrong parameters passed to the cp command:

  "cp: missing destination file operand after 'arch/x86/boot/isoimage/'"

This is caused because FDINITRDS is an empty array.

Solution: Check if FDINITRDS is empty before executing the "cp" command,
similar to how it is done in the case of hdimage.

Signed-off-by: Nir Lichtman <nir@...htman.org>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ard Biesheuvel <ardb@...nel.org>
Cc: Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc: Michal Marek <michal.lkml@...kovi.net>
Link: https://lore.kernel.org/r/20250110120500.GA923218@lichtman.org
---
 arch/x86/boot/genimage.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
index c9299ae..3882ead 100644
--- a/arch/x86/boot/genimage.sh
+++ b/arch/x86/boot/genimage.sh
@@ -22,6 +22,7 @@
 # This script requires:
 #   bash
 #   syslinux
+#   genisoimage
 #   mtools (for fdimage* and hdimage)
 #   edk2/OVMF (for hdimage)
 #
@@ -251,7 +252,9 @@ geniso() {
 	cp "$isolinux" "$ldlinux" "$tmp_dir"
 	cp "$FBZIMAGE" "$tmp_dir"/linux
 	echo default linux "$KCMDLINE" > "$tmp_dir"/isolinux.cfg
-	cp "${FDINITRDS[@]}" "$tmp_dir"/
+	if [ ${#FDINITRDS[@]} -gt 0 ]; then
+		cp "${FDINITRDS[@]}" "$tmp_dir"/
+	fi
 	genisoimage -J -r -appid 'LINUX_BOOT' -input-charset=utf-8 \
 		    -quiet -o "$FIMAGE" -b isolinux.bin \
 		    -c boot.cat -no-emul-boot -boot-load-size 4 \