From patchwork Tue Mar 22 21:44:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12789197 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C53F0C433F5 for ; Tue, 22 Mar 2022 21:44:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3A7C6B0105; Tue, 22 Mar 2022 17:44:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9B816B0106; Tue, 22 Mar 2022 17:44:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC7166B0107; Tue, 22 Mar 2022 17:44:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id AB1336B0105 for ; Tue, 22 Mar 2022 17:44:19 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7AE5F8249980 for ; Tue, 22 Mar 2022 21:44:19 +0000 (UTC) X-FDA: 79273351038.21.B9BDC9A Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf22.hostedemail.com (Postfix) with ESMTP id CE1F1C0031 for ; Tue, 22 Mar 2022 21:44:18 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id AF87BB81DB9; Tue, 22 Mar 2022 21:44:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EF77C340F2; Tue, 22 Mar 2022 21:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1647985456; bh=1o+/vlScURsqqtKv20aatWbXrGRQh7hTcKq2D/GnsUo=; h=Date:To:From:In-Reply-To:Subject:From; b=myQxlKVGAU2YOqcufqolY6980r6D+v6HSqx3qIPQmqNigZw3fM34RwCUyPFxyQh+M y/YsJ3g0n/e5i7qGdJxAQ9GzVrb5fTG9VyRcjJd3dOxEPWLNgRvZwx07x7oLMx4dvM 6jgkFV0kY338zGbVzORw1C8IIkWL8caL1kr5rIeo= Date: Tue, 22 Mar 2022 14:44:15 -0700 To: naoya.horiguchi@nec.com,linmiaohe@huawei.com,akpm@linux-foundation.org,patches@lists.linux.dev,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org From: Andrew Morton In-Reply-To: <20220322143803.04a5e59a07e48284f196a2f9@linux-foundation.org> Subject: [patch 113/227] mm/memory-failure.c: catch unexpected -EFAULT from vma_address() Message-Id: <20220322214416.2EF77C340F2@smtp.kernel.org> Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=myQxlKVG; spf=pass (imf22.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Stat-Signature: zn5zbe44jjabw48663fn19uppitiyqqe X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: CE1F1C0031 X-HE-Tag: 1647985458-555943 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Miaohe Lin Subject: mm/memory-failure.c: catch unexpected -EFAULT from vma_address() It's unexpected to walk the page table when vma_address() return -EFAULT. But dev_pagemap_mapping_shift() is called only when vma associated to the error page is found already in collect_procs_{file,anon}, so vma_address() should not return -EFAULT except with some bug, as Naoya pointed out. We can use VM_BUG_ON_VMA() to catch this bug here. Link: https://lkml.kernel.org/r/20220218090118.1105-3-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Acked-by: Naoya Horiguchi Signed-off-by: Andrew Morton --- mm/memory-failure.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/memory-failure.c~mm-memory-failurec-catch-unexpected-efault-from-vma_address +++ a/mm/memory-failure.c @@ -315,6 +315,7 @@ static unsigned long dev_pagemap_mapping pmd_t *pmd; pte_t *pte; + VM_BUG_ON_VMA(address == -EFAULT, vma); pgd = pgd_offset(vma->vm_mm, address); if (!pgd_present(*pgd)) return 0;