linux-ext4 - [PATCH 4/8] generic/740: skip jffs2 as foreign fs earlier

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240623121103.974270-5-hch@lst.de>
Date: Sun, 23 Jun 2024 14:10:33 +0200
From: Christoph Hellwig <hch@....de>
To: Zorro Lang <zlang@...nel.org>
Cc: fstests@...r.kernel.org,
	"Theodore Ts'o" <tytso@....edu>,
	linux-ext4@...r.kernel.org
Subject: [PATCH 4/8] generic/740: skip jffs2 as foreign fs earlier

Commit a633d252e3c4 ("shared/032: add options for jffs2") added a
check to skip checking the overwrite of jffs2, but only after
adding specific mkfs options for it and zeroing part of the device.

Switch to skipping it earlier in a more obvious place.

Signed-off-by: Christoph Hellwig <hch@....de>
---
 tests/generic/740 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/generic/740 b/tests/generic/740
index 6a97ac69a..bac927227 100755
--- a/tests/generic/740
+++ b/tests/generic/740
@@ -46,8 +46,8 @@ do
 		preargs="-p lock_nolock -j 1"
 		;;
 	jffs2)
-		# jffs2 mkfs requires '-r $directory' and '-o $image'
-		preargs="-r /proc/fs -o"
+		# mkfs.jffs2 doesn't work like a normal mkfs and just fails
+		continue;
 		;;
 	jfs)
 		preop="echo Y |"
@@ -79,8 +79,6 @@ do
 
 	if [ $? -eq 0 ] ; then
 		# next, ensure we don't overwrite it
-		# jffs2 mkfs doesn't check overwrite case
-		[ $fs = jffs2 ] && continue
 
 		echo "=== Attempting $FSTYP overwrite of $fs..." >>$seqres.full
 		${MKFS_PROG} -t $FSTYP $SCRATCH_DEV >>$seqres.full 2>&1
-- 
2.43.0