From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 19 Nov 2024 13:32:02 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v6.12.1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16632a992f80566210c3f75625156ba2e2dfcd0e;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch
---

diff --git a/queue-6.1/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch b/queue-6.1/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch
new file mode 100644
index 00000000000..fdf47f24660
--- /dev/null
+++ b/queue-6.1/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch
@@ -0,0 +1,42 @@
+From d1aa0c04294e29883d65eac6c2f72fe95cc7c049 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 15 Nov 2024 16:57:24 -0800
+Subject: mm: revert "mm: shmem: fix data-race in shmem_getattr()"
+
+From: Andrew Morton <akpm@linux-foundation.org>
+
+commit d1aa0c04294e29883d65eac6c2f72fe95cc7c049 upstream.
+
+Revert d949d1d14fa2 ("mm: shmem: fix data-race in shmem_getattr()") as
+suggested by Chuck [1].  It is causing deadlocks when accessing tmpfs over
+NFS.
+
+As Hugh commented, "added just to silence a syzbot sanitizer splat: added
+where there has never been any practical problem".
+
+Link: https://lkml.kernel.org/r/ZzdxKF39VEmXSSyN@tissot.1015granger.net [1]
+Fixes: d949d1d14fa2 ("mm: shmem: fix data-race in shmem_getattr()")
+Acked-by: Hugh Dickins <hughd@google.com>
+Cc: Chuck Lever <chuck.lever@oracle.com>
+Cc: Jeongjun Park <aha310510@gmail.com>
+Cc: Yu Zhao <yuzhao@google.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Hugh Dickins <hughd@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ mm/shmem.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -1086,9 +1086,7 @@ static int shmem_getattr(struct user_nam
+ 	stat->attributes_mask |= (STATX_ATTR_APPEND |
+ 			STATX_ATTR_IMMUTABLE |
+ 			STATX_ATTR_NODUMP);
+-	inode_lock_shared(inode);
+ 	generic_fillattr(&init_user_ns, inode, stat);
+-	inode_unlock_shared(inode);
+ 
+ 	if (shmem_is_huge(NULL, inode, 0, false))
+ 		stat->blksize = HPAGE_PMD_SIZE;
diff --git a/queue-6.1/series b/queue-6.1/series
index 6253bd1282d..69f51d99707 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -58,3 +58,4 @@ fs-9p-fix-uninitialized-values-during-inode-evict.patch
 ipvs-properly-dereference-pe-in-ip_vs_add_service.patch
 net-sched-taprio-extend-minimum-interval-restriction-to-entire-cycle-too.patch
 net-fec-remove-.ndo_poll_controller-to-avoid-deadlocks.patch
+mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch