Commit a8f61fd7 authored by Andrew Morton's avatar Andrew Morton Committed by Heyuan Wang
Browse files

mm: revert "mm: shmem: fix data-race in shmem_getattr()" 

mainline inclusion
from mainline-v6.12
commit d1aa0c04294e29883d65eac6c2f72fe95cc7c049
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB957P
CVE: CVE-2024-53136

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d1aa0c04294e29883d65eac6c2f72fe95cc7c049

--------------------------------

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: default avatarHugh 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarHeyuan Wang <wangheyuan2@h-partners.com>
parent 46064348

mm/shmem.c

+0 −2
Original line number Diff line number Diff line
@@ -1167,9 +1167,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, 
	stat->attributes_mask |= (STATX_ATTR_APPEND |

			STATX_ATTR_IMMUTABLE |

			STATX_ATTR_NODUMP);

	inode_lock_shared(inode);

	generic_fillattr(idmap, request_mask, inode, stat);

	inode_unlock_shared(inode);



	if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0))

		stat->blksize = HPAGE_PMD_SIZE;