This is a note to let you know that I've just added the patch titled
btrfs: reject encoded write if inode has nodatasum flag set
to the 6.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
btrfs-reject-encoded-write-if-inode-has-nodatasum-flag-set.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1bd96c92c6a0a4d43815eb685c15aa4b78879dc9 Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana@xxxxxxxx>
Date: Fri, 2 Feb 2024 12:09:22 +0000
Subject: btrfs: reject encoded write if inode has nodatasum flag set
From: Filipe Manana <fdmanana@xxxxxxxx>
commit 1bd96c92c6a0a4d43815eb685c15aa4b78879dc9 upstream.
Currently we allow an encoded write against inodes that have the NODATASUM
flag set, either because they are NOCOW files or they were created while
the filesystem was mounted with "-o nodatasum". This results in having
compressed extents without corresponding checksums, which is a filesystem
inconsistency reported by 'btrfs check'.
For example, running btrfs/281 with MOUNT_OPTIONS="-o nodatacow" triggers
this and 'btrfs check' errors out with:
[1/7] checking root items
[2/7] checking extents
[3/7] checking free space tree
[4/7] checking fs roots
root 256 inode 257 errors 1040, bad file extent, some csum missing
root 256 inode 258 errors 1040, bad file extent, some csum missing
ERROR: errors found in fs roots
(...)
So reject encoded writes if the target inode has NODATASUM set.
CC: stable@xxxxxxxxxxxxxxx # 6.1+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
Reviewed-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/inode.c | 7 +++++++
1 file changed, 7 insertions(+)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -10233,6 +10233,13 @@ ssize_t btrfs_do_encoded_write(struct ki
if (encoded->encryption != BTRFS_ENCODED_IO_ENCRYPTION_NONE)
return -EINVAL;
+ /*
+ * Compressed extents should always have checksums, so error out if we
+ * have a NOCOW file or inode was created while mounted with NODATASUM.
+ */
+ if (inode->flags & BTRFS_INODE_NODATASUM)
+ return -EINVAL;
+
orig_count = iov_iter_count(from);
/* The extent size must be sane. */
Patches currently in stable-queue which might be from fdmanana@xxxxxxxx are
queue-6.7/btrfs-do-not-assert-if-the-newly-created-subvolume-already-got-read.patch
queue-6.7/btrfs-don-t-reserve-space-for-checksums-when-writing-to-nocow-files.patch
queue-6.7/btrfs-send-return-eopnotsupp-on-unknown-flags.patch
queue-6.7/btrfs-don-t-drop-extent_map-for-free-space-inode-on-write-error.patch
queue-6.7/btrfs-do-not-delete-unused-block-group-if-it-may-be-used-soon.patch
queue-6.7/btrfs-add-and-use-helper-to-check-if-block-group-is-used.patch
queue-6.7/btrfs-don-t-refill-whole-delayed-refs-block-reserve-when-starting-transaction.patch
queue-6.7/btrfs-reject-encoded-write-if-inode-has-nodatasum-flag-set.patch
queue-6.7/btrfs-add-new-unused-block-groups-to-the-list-of-unused-block-groups.patch
