FAILED: patch "[PATCH] Btrfs: fix clone vs chattr NODATASUM race" failed to apply to 4.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
b5c40d598f5408bd0ca22dfffa82f03cd9433f23Mon Sep 17 00:00:00 2001
From: Omar Sandoval <[email protected]>
Date: Tue, 22 May 2018 15:02:12 -0700
Subject: [PATCH] Btrfs: fix clone vs chattr NODATASUM race
In btrfs_clone_files(), we must check the NODATASUM flag while the inodes are locked. Otherwise, it's possible that btrfs_ioctl_setflags() will change the flags after we check and we can end up with a party checksummed file.
The race window is only a few instructions in size, between the if and the locks which is:
3834 if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode))
3835 return -EISDIR;
where the setflags must be run and toggle the NODATASUM flag (provided the file size is 0). The clone will block on the inode lock, segflags takes the inode lock, changes flags, releases log and clone continues.
Not impossible but still needs a lot of bad luck to hit unintentionally.
fs/btrfs/ioctl.c +7 -5
@@ -3808,11 +3808,6 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, src->i_sb != inode->i_sb)return -EXDEV ; -/* don't make the dst file partly checksummed */ -if ((BTRFS_I (src)->flags &BTRFS_INODE_NODATASUM ) != - (BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) -return -EINVAL ; -if (S_ISDIR (src->i_mode) ||S_ISDIR (inode->i_mode))return -EISDIR ;
@@ -3822,6 +3817,13 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,inode_lock (src); } +/* don't make the dst file partly checksummed */ +if ((BTRFS_I (src)->flags &BTRFS_INODE_NODATASUM ) != + (BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { + ret = -EINVAL ; + goto out_unlock; + } +/* determine range to clone */ ret = -EINVAL ;if (off + len > src->i_size || off + len < off)
PATCH 1/1 Btrfs: fix clone vs chattr NODATASUM race
From: Omar Sandoval <[email protected]>
In btrfs_clone_files(), we must check the NODATASUM flag while the inodes are locked. Otherwise, it's possible that btrfs_ioctl_setflags() will change the flags after we check and we can end up with a party checksummed file.
The race window is only a few instructions in size, between the if and the locks which is:
3834 if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode))
3835 return -EISDIR;
where the setflags must be run and toggle the NODATASUM flag (provided the file size is 0). The clone will block on the inode lock, segflags takes the inode lock, changes flags, releases log and clone continues.
Not impossible but still needs a lot of bad luck to hit unintentionally.
---
Hello Greg,
Here is a fixed version of the above patch for 4.4.
fs/btrfs/ioctl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/btrfs/ioctl.c +7 -5
@@ -3923,11 +3923,6 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,if (!(src_file.file->f_mode &FMODE_READ )) goto out_fput; -/* don't make the dst file partly checksummed */ -if ((BTRFS_I (src)->flags &BTRFS_INODE_NODATASUM ) != - (BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) - goto out_fput; - ret = -EISDIR ;if (S_ISDIR (src->i_mode) ||S_ISDIR (inode->i_mode)) goto out_fput;
@@ -3942,6 +3937,13 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,mutex_lock (&src->i_mutex); } +/* don't make the dst file partly checksummed */ +if ((BTRFS_I (src)->flags &BTRFS_INODE_NODATASUM ) != + (BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) { + ret = -EINVAL ; + goto out_unlock; + } +/* determine range to clone */ ret = -EINVAL ;if (off + len > src->i_size || off + len < off)
Signature · 1 line
2.7.4
Greg KH
maintainerRe: [PATCH] Btrfs: fix clone vs chattr NODATASUM race
Quoted 28 lines · Nikolay Borisov
From: Omar Sandoval <[email protected]>
In
btrfs_clone_files(), we must check the NODATASUM flag while the inodes are locked. Otherwise, it's possible thatbtrfs_ioctl_setflags()will change the flags after we check and we can end up with a party checksummed file.The race window is only a few instructions in size, between the if and the locks which is:
3834 if (
S_ISDIR(src->i_mode)||S_ISDIR(inode->i_mode))
3835 return-EISDIR;where the setflags must be run and toggle the NODATASUM flag (provided the file size is 0). The clone will block on the inode lock, segflags takes the inode lock, changes flags, releases log and clone continues.
Not impossible but still needs a lot of bad luck to hit unintentionally.
Fixes 0e7b824c4ef9 ("Btrfs: don't make a file partly checksummed through file clone")CC [email protected] # 4.4+Signed-off-by Omar Sandoval <[email protected]>Reviewed-by Nikolay Borisov <[email protected]>Reviewed-by David Sterba <[email protected]>[ update changelog ]Signed-off-by David Sterba <[email protected]>Signed-off-by Nikolay Borisov <[email protected]>[ adjusted for 4.4 ]
Quoted 5 lines
---
Hello Greg,
Here is a fixed version of the above patch for 4.4.
Next time please let me know what the original git commit id is, that makes it easier for me to apply.
thanks,
greg k-h