From: Greg Kroah-Hartman Date: Wed, 20 Mar 2019 19:21:40 +0000 (+0100) Subject: drop broken 4.19 btrfs patch X-Git-Tag: v3.18.137~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b9e5687c60bf3da8f2ac5e6ee1ac95a2c9d6835;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 4.19 btrfs patch --- diff --git a/queue-4.19/btrfs-drop-the-lock-on-error-in-btrfs_dev_replace_cancel.patch b/queue-4.19/btrfs-drop-the-lock-on-error-in-btrfs_dev_replace_cancel.patch deleted file mode 100644 index 0200aafe4f3..00000000000 --- a/queue-4.19/btrfs-drop-the-lock-on-error-in-btrfs_dev_replace_cancel.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 669e859b5ea7c6f4fce0149d3907c64e550c294b Mon Sep 17 00:00:00 2001 -From: Dan Carpenter -Date: Mon, 11 Feb 2019 21:32:10 +0300 -Subject: btrfs: drop the lock on error in btrfs_dev_replace_cancel - -From: Dan Carpenter - -commit 669e859b5ea7c6f4fce0149d3907c64e550c294b upstream. - -We should drop the lock on this error path. This has been found by a -static tool. - -The lock needs to be released, it's there to protect access to the -dev_replace members and is not supposed to be left locked. The value of -state that's being switched would need to be artifically changed to an -invalid value so the default: branch is taken. - -Fixes: d189dd70e255 ("btrfs: fix use-after-free due to race between replace start and cancel") -CC: stable@vger.kernel.org # 5.0+ -Reviewed-by: Anand Jain -Signed-off-by: Dan Carpenter -Reviewed-by: David Sterba -Signed-off-by: David Sterba -Signed-off-by: Greg Kroah-Hartman - ---- - fs/btrfs/dev-replace.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/fs/btrfs/dev-replace.c -+++ b/fs/btrfs/dev-replace.c -@@ -849,6 +849,7 @@ int btrfs_dev_replace_cancel(struct btrf - btrfs_destroy_dev_replace_tgtdev(tgt_device); - break; - default: -+ up_write(&dev_replace->rwsem); - result = -EINVAL; - } - diff --git a/queue-4.19/series b/queue-4.19/series index cd091c08dde..5c6eb9c3d43 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -169,6 +169,5 @@ ovl-do-not-lose-security.capability-xattr-over-metadata-file-copy-up.patch m68k-add-ffreestanding-to-cflags.patch btrfs-setup-a-nofs-context-for-memory-allocation-at-btrfs_create_tree.patch btrfs-setup-a-nofs-context-for-memory-allocation-at-__btrfs_set_acl.patch -btrfs-drop-the-lock-on-error-in-btrfs_dev_replace_cancel.patch btrfs-ensure-that-a-dup-or-raid1-block-group-has-exactly-two-stripes.patch btrfs-fix-corruption-reading-shared-and-compressed-extents-after-hole-punching.patch