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

5.4-stable patches

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

diff --git a/queue-5.4/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch b/queue-5.4/mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch
new file mode 100644
index 00000000000..3f501095da3
--- /dev/null
+++ b/queue-5.4/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
+@@ -1011,9 +1011,7 @@ static int shmem_getattr(const struct pa
+ 		shmem_recalc_inode(inode);
+ 		spin_unlock_irq(&info->lock);
+ 	}
+-	inode_lock_shared(inode);
+ 	generic_fillattr(inode, stat);
+-	inode_unlock_shared(inode);
+ 
+ 	if (is_huge_enabled(sb_info))
+ 		stat->blksize = HPAGE_PMD_SIZE;
diff --git a/queue-5.4/series b/queue-5.4/series
index 7979fbedace..21768a3d761 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -9,3 +9,4 @@ nilfs2-fix-null-ptr-deref-in-block_dirty_buffer-tracepoint.patch
 revert-mmc-dw_mmc-fix-idmac-operation-with-pages-bigger-than-4k.patch
 media-dvbdev-fix-the-logic-when-dvb_dynamic_minors-is-not-set.patch
 kbuild-use-uname-for-linux_compile_host-detection.patch
+mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch