Commit c8f1dd00 authored by Miaohe Lin's avatar Miaohe Lin Committed by Zheng Zengkai
Browse files

mm/shmem: fix shmem_swapin() race with swapoff 

mainline inclusion
from mainline-v5.14-rc1
commit 2efa33fc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I645JI
CVE: NA

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

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

When I was investigating the swap code, I found the below possible race
window:

CPU 1                                         CPU 2
-----                                         -----
shmem_swapin
  swap_cluster_readahead
    if (likely(si->flags & (SWP_BLKDEV | SWP_FS_OPS))) {
                                              swapoff
                                                ..
                                                si->swap_file = NULL;
                                                ..
    struct inode *inode = si->swap_file->f_mapping->host;[oops!]

Close this race window by using get/put_swap_device() to guard against
concurrent swapoff.

Link: https://lkml.kernel.org/r/20210426123316.806267-5-linmiaohe@huawei.com


Fixes: 8fd2e0b5 ("mm: swap: check if swap backing device is congested or not")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Alex Shi <alexs@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
Reviewed-by: default avatarKefeng <Wang&lt;wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 504f60d0

mm/shmem.c

+13 −1
Original line number Diff line number Diff line
@@ -1711,7 +1711,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 
	struct address_space *mapping = inode->i_mapping;

	struct shmem_inode_info *info = SHMEM_I(inode);

	struct mm_struct *charge_mm = vma ? vma->vm_mm : current->mm;

	struct page *page;

	struct swap_info_struct *si;

	struct page *page = NULL;

	swp_entry_t swap;

	int error;
@@ -1719,6 +1720,12 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 
	swap = radix_to_swp_entry(*pagep);

	*pagep = NULL;



	/* Prevent swapoff from happening to us. */

	si = get_swap_device(swap);

	if (!si) {

		error = EINVAL;

		goto failed;

	}

	/* Look it up and read it in.. */

	page = lookup_swap_cache(swap, NULL, 0);

	if (!page) {
@@ -1780,6 +1787,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 
	swap_free(swap);



	*pagep = page;

	if (si)

		put_swap_device(si);

	return 0;

failed:

	if (!shmem_confirm_swap(mapping, index, swap))
@@ -1790,6 +1799,9 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 
		put_page(page);

	}



	if (si)

		put_swap_device(si);



	return error;

}