linux-ext4 - [PATCH 13/33] defrag: fix ext4 defrag ioctl test

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: <176169820221.1433624.1369544788981212640.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 18:23:49 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: djwong@...nel.org, zlang@...hat.com
Cc: neal@...pa.dev, fstests@...r.kernel.org, linux-ext4@...r.kernel.org,
 linux-fsdevel@...r.kernel.org, joannelkoong@...il.com, bernd@...ernd.com
Subject: [PATCH 13/33] defrag: fix ext4 defrag ioctl test

From: Darrick J. Wong <djwong@...nel.org>

ioctl() can return ENOTTY if the ioctl number isn't recognized at all.
Change _require_defrag to _notrun the test if the ext4 defrag ioctl
isn't recognised at all.

Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
 common/defrag |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/defrag b/common/defrag
index c054e62bde6f4d..43ec07ddd4ac2a 100644
--- a/common/defrag
+++ b/common/defrag
@@ -19,7 +19,7 @@ _require_defrag()
 	$XFS_IO_PROG -f -c "pwrite -b $bsize 0 $bsize" $testfile > /dev/null
 	cp $testfile $donorfile
 	echo $testfile | $here/src/e4compact -v -f $donorfile | \
-		grep -q "err:95"
+		grep -q -E "err:(95|25)"
 	if [ $? -eq 0 ]; then
 		rm -f $testfile $donorfile 2>&1 > /dev/null
 		_notrun "$FSTYP test filesystem doesn't support online defrag"