Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2726272pxv; Sun, 11 Jul 2021 23:59:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9gHr0z685D1MJeXrz6PL5qQqxIhY5sDJtDWhg92/Gplo1dcGwv8Gk1gg7c0Aig3ntVyxW X-Received: by 2002:a92:3f01:: with SMTP id m1mr37884661ila.122.1626073193924; Sun, 11 Jul 2021 23:59:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626073193; cv=none; d=google.com; s=arc-20160816; b=t2JKXYIm+wj2eSt0lbbhVVb/eq1F4RVnSv8O/Eal0osd32AT+QxCq1gHGnejtET2+U Yi7wCgPGDGMnYzLSj7rQuDmdFfcX71AvafhV7P2D6Yu/hK5LVRUYSUFtoOA031IPL5zW PX2e0gUCUVSskBNEn2IBjTnpxpFdVvLn/HBAS0LOh9yLKtxJ2k1TipxsWyM8hv4ADGjp bL/cv0hnhosUtJp6Ik/mA2FX2Ohc1qCgbb9x7moFZ1VE+JRSUhPCo1T7qUyNWuLq5s1H vOQ9mYckXn6D2BTaIheU12/UJUF58w0W8WDETFRlLK139AeWwisw/E2mb8X/kWq9BeJI GSZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w6bb6QvuSM0J/15jConnvq3GJw71BBKFsKdyM1jFHgQ=; b=GnetAbli8BOpcbsVnMwd9AZtHFIcpYU+zlAtrjUOe8WECC9KaPezDCfBqkO93uxapt y/0q0zYdMzRh7oKINUo0wqSrBaU56ogUI5f5RnQY5l+lMssEtLfIP38ITecKJF12rhTo NrtDMuwJ0lOUJguy4wjTyAlCj9DJs01gZHR3rlZ3PER+rFptVs1yIdt6c2E9syqsBUZt SVXy8GROvhPsckpwOXj2KyRBAzLJBSacHdYtc77xmypp4mRhh13zAVNe/njfEWJ/LV9s lCcTxgJdZ7vopRp6NBXxt7iyicWr6ACJhfx+3PNn3HyZBMXZJY2So8K8IUXTWLHEq0Pc TB7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YGL4qzdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j23si17374593iog.79.2021.07.11.23.59.42; Sun, 11 Jul 2021 23:59:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YGL4qzdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240092AbhGLHBD (ORCPT + 99 others); Mon, 12 Jul 2021 03:01:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:41510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239168AbhGLGov (ORCPT ); Mon, 12 Jul 2021 02:44:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A158611CC; Mon, 12 Jul 2021 06:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072062; bh=kw9mPCjWUItoo6kbpoXHf6B4XaYRVLNXgPwqOgfwDb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YGL4qzdUFi0rGHkGjpJe2INl2gzkgXUWG75wG5IdqHFqNXf9s24D2J5HnYsVAYyXw dKtQJNgHlYmOxDb6JJSK/l4jopaoeUI9YvhyBtoGDj+6/tMI5vRFzrScJ6x3X8zTA+ YZZRvkN3hcW3c4PhAx1jOVyNWBjaW7cbOb4ml5i0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaohe Lin , "Huang, Ying" , Dennis Zhou , Tim Chen , Hugh Dickins , Johannes Weiner , Michal Hocko , Joonsoo Kim , Alex Shi , Matthew Wilcox , Minchan Kim , Wei Yang , Yang Shi , David Hildenbrand , Yu Zhao , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.10 295/593] mm/shmem: fix shmem_swapin() race with swapoff Date: Mon, 12 Jul 2021 08:07:35 +0200 Message-Id: <20210712060917.020538142@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaohe Lin [ Upstream commit 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: 8fd2e0b505d1 ("mm: swap: check if swap backing device is congested or not") Signed-off-by: Miaohe Lin Reviewed-by: "Huang, Ying" Cc: Dennis Zhou Cc: Tim Chen Cc: Hugh Dickins Cc: Johannes Weiner Cc: Michal Hocko Cc: Joonsoo Kim Cc: Alex Shi Cc: Matthew Wilcox Cc: Minchan Kim Cc: Wei Yang Cc: Yang Shi Cc: David Hildenbrand Cc: Yu Zhao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/shmem.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 6e487bf555f9..a847cba3c226 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1698,7 +1698,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; @@ -1706,6 +1707,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) { @@ -1767,6 +1774,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)) @@ -1777,6 +1786,9 @@ unlock: put_page(page); } + if (si) + put_swap_device(si); + return error; } -- 2.30.2