Commit 6dd6a407 authored by Mina Almasry's avatar Mina Almasry Committed by Jinjiang Tu
Browse files

hugetlbfs: fix hugetlbfs_statfs() locking 

mainline inclusion
from mainline-v5.19-rc1
commit 4b25f030
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9SZXR
CVE: NA

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

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

After commit db71ef79 ("hugetlb: make free_huge_page irq safe"), the
subpool lock should be locked with spin_lock_irq() and all call sites was
modified as such, except for the ones in hugetlbfs_statfs().

Link: https://lkml.kernel.org/r/20220429202207.3045-1-almasrymina@google.com


Fixes: db71ef79 ("hugetlb: make free_huge_page irq safe")
Signed-off-by: default avatarMina Almasry <almasrymina@google.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJinjiang Tu <tujinjiang@huawei.com>
parent caafc0a9

fs/hugetlbfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1099,12 +1099,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
		if (sbinfo->spool) {

			long free_pages;



			spin_lock(&sbinfo->spool->lock);

			spin_lock_irq(&sbinfo->spool->lock);

			buf->f_blocks = sbinfo->spool->max_hpages;

			free_pages = sbinfo->spool->max_hpages

				- sbinfo->spool->used_hpages;

			buf->f_bavail = buf->f_bfree = free_pages;

			spin_unlock(&sbinfo->spool->lock);

			spin_unlock_irq(&sbinfo->spool->lock);

			buf->f_files = sbinfo->max_inodes;

			buf->f_ffree = sbinfo->free_inodes;

		}