Skip to contentSkip to conversation

common/encrypt: Explicitly set the test file to uncompressed

PATCH In review Jan Prusakowski 3 participants 3 messages Oct 6, 2025 – Oct 11, 2025

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 common/encrypt: Explicitly set the test file to uncompressed

verify_ciphertext_for_encryption_policy() checks if encryption works correctly by reading encrypted file's contents directly from a block device and comparing it to a known good ciphertext.

This, however, won't work if the test file is also compressed. So this patch adds a check if a test file is compressed and disables its compression in this case.

---
Changes in v2:
The test file is now created empty first, followed by resetting the FS_COMP_FL attribute, and then copying the test data.

Changes in v3:
Added explicit FS_NOCOMP_FL attribute to the test file.

---
 common/encrypt | 7 +++++++
 1 file changed, 7 insertions(+)
common/encrypt +7 -0
index d4f6e3dc..f2687631 100644
@@ -790,6 +790,13 @@ _do_verify_ciphertext_for_encryption_policy()
 	_set_encpolicy $dir $keyspec $set_encpolicy_args -f $policy_flags
 	for src in $tmp.testfile_*; do
 		dst=$dir/${src##*.}
+		# To make sure the test file is not compressed we create an empty one
+		# and disable compression first (F2FS won't allow resetting the
+		# compression flag if the file has data already in it).
+		touch $dst
+		if lsattr $dst | grep -qE ".+c.+ $dst" ; then
+			chattr -c +m $dst
+		fi
 		cp $src $dst
 		inode=$(stat -c %i $dst)
 		blocklist=$(_get_ciphertext_block_list $dst)
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Reviewed-by on v3 1/1
#1 lore raw
Quoted 9 lines · Jan Prusakowski

verify_ciphertext_for_encryption_policy() checks if encryption works correctly by reading encrypted file's contents directly from a block device and comparing it to a known good ciphertext.

This, however, won't work if the test file is also compressed. So this patch adds a check if a test file is compressed and disables its compression in this case.

- Eric

Reviewed-by on v3 1/1
#2 lore raw
In reply to Jan Prusakowski
Quoted 9 lines · Jan Prusakowski

verify_ciphertext_for_encryption_policy() checks if encryption works correctly by reading encrypted file's contents directly from a block device and comparing it to a known good ciphertext.

This, however, won't work if the test file is also compressed. So this patch adds a check if a test file is compressed and disables its compression in this case.

Thanks,