From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Oct 2022 18:46:16 +0000 (+0200)
Subject: 6.0-stable patches
X-Git-Tag: v6.0.1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=349588b1560e7a7d435fa9cc3cee37178710e03d;p=thirdparty%2Fkernel%2Fstable-queue.git

6.0-stable patches

added patches:
	fs-fix-uaf-gpf-bug-in-nilfs_mdt_destroy.patch
---

diff --git a/queue-6.0/fs-fix-uaf-gpf-bug-in-nilfs_mdt_destroy.patch b/queue-6.0/fs-fix-uaf-gpf-bug-in-nilfs_mdt_destroy.patch
new file mode 100644
index 00000000000..28b1861c653
--- /dev/null
+++ b/queue-6.0/fs-fix-uaf-gpf-bug-in-nilfs_mdt_destroy.patch
@@ -0,0 +1,62 @@
+From 2e488f13755ffbb60f307e991b27024716a33b29 Mon Sep 17 00:00:00 2001
+From: Dongliang Mu <mudongliangabcd@gmail.com>
+Date: Tue, 16 Aug 2022 12:08:58 +0800
+Subject: fs: fix UAF/GPF bug in nilfs_mdt_destroy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Dongliang Mu <mudongliangabcd@gmail.com>
+
+commit 2e488f13755ffbb60f307e991b27024716a33b29 upstream.
+
+In alloc_inode, inode_init_always() could return -ENOMEM if
+security_inode_alloc() fails, which causes inode->i_private
+uninitialized. Then nilfs_is_metadata_file_inode() returns
+true and nilfs_free_inode() wrongly calls nilfs_mdt_destroy(),
+which frees the uninitialized inode->i_private
+and leads to crashes(e.g., UAF/GPF).
+
+Fix this by moving security_inode_alloc just prior to
+this_cpu_inc(nr_inodes)
+
+Link: https://lkml.kernel.org/r/CAFcO6XOcf1Jj2SeGt=jJV59wmhESeSKpfR0omdFRq+J9nD1vfQ@mail.gmail.com
+Reported-by: butt3rflyh4ck <butterflyhuangxx@gmail.com>
+Reported-by: Hao Sun <sunhao.th@gmail.com>
+Reported-by: Jiacheng Xu <stitch@zju.edu.cn>
+Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
+Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Cc: stable@vger.kernel.org
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/inode.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -192,8 +192,6 @@ int inode_init_always(struct super_block
+ 	inode->i_wb_frn_history = 0;
+ #endif
+ 
+-	if (security_inode_alloc(inode))
+-		goto out;
+ 	spin_lock_init(&inode->i_lock);
+ 	lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
+ 
+@@ -228,11 +226,12 @@ int inode_init_always(struct super_block
+ 	inode->i_fsnotify_mask = 0;
+ #endif
+ 	inode->i_flctx = NULL;
++
++	if (unlikely(security_inode_alloc(inode)))
++		return -ENOMEM;
+ 	this_cpu_inc(nr_inodes);
+ 
+ 	return 0;
+-out:
+-	return -ENOMEM;
+ }
+ EXPORT_SYMBOL(inode_init_always);
+ 
diff --git a/queue-6.0/series b/queue-6.0/series
index 9041b7f9091..327718635e2 100644
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -1,4 +1,5 @@
 xsk-inherit-need_wakeup-flag-for-shared-sockets.patch
+fs-fix-uaf-gpf-bug-in-nilfs_mdt_destroy.patch
 fix-coredump-breakage.patch
 sparc-unbreak-the-build.patch
 makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch