5.4-stable patches

added patches:
	btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644 (file)
index 0000000..8d516b0
--- /dev/null
+++ b/queue-5.10/series
@@ -0,0 +1,2 @@
+btrfs-reloc-fix-wrong-file-extent-type-check-to-avoid-false-enoent.patch
+btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch

diff --git a/queue-5.4/btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch b/queue-5.4/btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch
new file mode 100644 (file)
index 0000000..e8a3e21
--- /dev/null
+++ b/queue-5.4/btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch
@@ -0,0 +1,41 @@
+From 29b665cc51e8b602bf2a275734349494776e3dbc Mon Sep 17 00:00:00 2001
+From: Su Yue <l@damenly.su>
+Date: Sun, 3 Jan 2021 17:28:03 +0800
+Subject: btrfs: prevent NULL pointer dereference in extent_io_tree_panic
+
+From: Su Yue <l@damenly.su>
+
+commit 29b665cc51e8b602bf2a275734349494776e3dbc upstream.
+
+Some extent io trees are initialized with NULL private member (e.g.
+btrfs_device::alloc_state and btrfs_fs_info::excluded_extents).
+Dereference of a NULL tree->private as inode pointer will cause panic.
+
+Pass tree->fs_info as it's known to be valid in all cases.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208929
+Fixes: 05912a3c04eb ("btrfs: drop extent_io_ops::tree_fs_info callback")
+CC: stable@vger.kernel.org # 4.19+
+Reviewed-by: Anand Jain <anand.jain@oracle.com>
+Signed-off-by: Su Yue <l@damenly.su>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/extent_io.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/fs/btrfs/extent_io.c
++++ b/fs/btrfs/extent_io.c
+@@ -647,9 +647,7 @@ alloc_extent_state_atomic(struct extent_
+ 
+ static void extent_io_tree_panic(struct extent_io_tree *tree, int err)
+ {
+-      struct inode *inode = tree->private_data;
+-
+-      btrfs_panic(btrfs_sb(inode->i_sb), err,
++      btrfs_panic(tree->fs_info, err,
+       "locking error: extent tree was modified by another thread while locked");
+ }
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index 7b3928912146b9b061932a1e24c9a3464d31ce77..094cdeed8b8c7e2bf13c4a557cf43f5ae5fba89a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1 +1,2 @@
 kbuild-enforce-werror-return-type.patch
+btrfs-prevent-null-pointer-dereference-in-extent_io_tree_panic.patch