5.15-stable patches

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

diff --git a/queue-5.15/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch b/queue-5.15/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch
new file mode 100644 (file)
index 0000000..3397632
--- /dev/null
+++ b/queue-5.15/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
+@@ -1077,9 +1077,7 @@ static int shmem_getattr(struct user_nam
+               shmem_recalc_inode(inode);
+               spin_unlock_irq(&info->lock);
+       }
+-      inode_lock_shared(inode);
+       generic_fillattr(&init_user_ns, inode, stat);
+-      inode_unlock_shared(inode);
+ 
+       if (shmem_is_huge(NULL, inode, 0))
+               stat->blksize = HPAGE_PMD_SIZE;

diff --git a/queue-5.15/series b/queue-5.15/series
index 699dbb7889589974cad4aaa7ba223a26c2ccbb10..4dcb58ee45fd3cce3f3adbb28afcd0142fab70df 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -26,3 +26,4 @@ nfsd-limit-the-number-of-concurrent-async-copy-operations.patch
 nfsd-initialize-struct-nfsd4_copy-earlier.patch
 nfsd-never-decrement-pending_async_copies-on-error.patch
 mptcp-cope-racing-subflow-creation-in-mptcp_rcv_space_adjust.patch
+mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch