From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C913EC47080 for ; Tue, 1 Jun 2021 21:11:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 68F48613AE for ; Tue, 1 Jun 2021 21:11:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68F48613AE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F226A6B006C; Tue, 1 Jun 2021 17:11:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED1BE6B006E; Tue, 1 Jun 2021 17:11:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4B416B0070; Tue, 1 Jun 2021 17:11:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id A27FB6B006C for ; Tue, 1 Jun 2021 17:11:26 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 47E7E180AD817 for ; Tue, 1 Jun 2021 21:11:26 +0000 (UTC) X-FDA: 78206400972.16.FE29867 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by imf29.hostedemail.com (Postfix) with ESMTP id 14636547 for ; Tue, 1 Jun 2021 21:11:09 +0000 (UTC) Received: by mail-ot1-f50.google.com with SMTP id x41-20020a05683040a9b02903b37841177eso581519ott.9 for ; Tue, 01 Jun 2021 14:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=mGezqLCwqfVvLkMCE7dsqP76GlZ1rrIMTNorbY8nnRE=; b=XiFqJgKbQf+NFm9F2qeWGDqMQtIusE6tfI/d7uCReiNCeI8t1UgzW0tp8FS3tjI6Qn MM058Q8yao+WMfmJTIHUWTNzTCfxl0dIXFzHmnGtdNyydEMDn2/e3yjwWs/UzgnrXiML QqN3GCoZNMystw71jGSHVCRio97HkV3DOsCbiacwt0uIOU20iUscldneY3FmvXADytiw qcm939hv9ywb7M2e+4AI/6XxQYrUoTPfjXtvMcRDBA3OWOrUJYdf8NTD8fr9lVL5CNAr lijoUGLV2r+wmMfg5xsYNOja0Wpem4iA836KRAUuaYwYszImmI/uOurTB+d/d9VaEbPt V9GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=mGezqLCwqfVvLkMCE7dsqP76GlZ1rrIMTNorbY8nnRE=; b=bJL7iZsHwkpNK1bN9XLo0qSe9qwwKWoCGUhldBY0N2jQExOOxe+VCPySgHxDeQcvpQ y7AJTpUAOnITjtNHtvQvM2dV4Xcj4L/WdiJYxwZ+IWtMFSTgmvXY1C1xvaVZLlIMc/1P +/6pU/SUSMFnZz3/sa5LF0vcv9P8hcjZikwIEjo9+rteQECzKLm2konVJMHMchZ/uZUO 4p1SLhXIcOZ/b8p/mI78qvoZc3FHz5kCo8RP1j7fFiGYg8lNCTuK5IkcwLasbQWa5pe0 3jd4cB5tsXpdHtLGO0lcMwUTqNa9baGQBwU6xdhk86ZduxwiWEd86wyEEowUdl/FelTx bNsw== X-Gm-Message-State: AOAM530anQe3GmJUPa3rg+xNzmwz4BJEjowr5xAitcqUHctyoLhEletB ls4Kp3ENicRlN3O2p7IdoB5GrQ== X-Google-Smtp-Source: ABdhPJwbmIlsdvD15zqtJYc7eIWJ6uhy2nPvhdlXW5j9Ohe3labw6u0GYlOiclpWFjO1cjJLZLKpjg== X-Received: by 2002:a9d:684e:: with SMTP id c14mr23250577oto.295.1622581885174; Tue, 01 Jun 2021 14:11:25 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id t14sm3644391ooh.39.2021.06.01.14.11.23 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Tue, 01 Jun 2021 14:11:24 -0700 (PDT) Date: Tue, 1 Jun 2021 14:11:22 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Andrew Morton cc: Hugh Dickins , "Kirill A. Shutemov" , Yang Shi , Wang Yugui , Matthew Wilcox , Naoya Horiguchi , Alistair Popple , Ralph Campbell , Zi Yan , Miaohe Lin , Minchan Kim , Jue Wang , Peter Xu , Jan Kara , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] mm/thp: fix page_address_in_vma() on file THP tails In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=XiFqJgKb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of hughd@google.com designates 209.85.210.50 as permitted sender) smtp.mailfrom=hughd@google.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 14636547 X-Stat-Signature: qcwpamwypx4myjk76nqbt3ab9xx1a9he X-HE-Tag: 1622581869-946763 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: Jue Wang Anon THP tails were already supported, but memory-failure may need to use page_address_in_vma() on file THP tails, which its page->mapping check did not permit: fix it. hughd adds: no current usage is known to hit the issue, but this does fix a subtle trap in a general helper: best fixed in stable sooner than later. Fixes: 800d8c63b2e9 ("shmem: add huge pages support") Signed-off-by: Jue Wang Signed-off-by: Hugh Dickins Cc: --- mm/rmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 144de54efc1c..e05c300048e6 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -716,11 +716,11 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) if (!vma->anon_vma || !page__anon_vma || vma->anon_vma->root != page__anon_vma->root) return -EFAULT; - } else if (page->mapping) { - if (!vma->vm_file || vma->vm_file->f_mapping != page->mapping) - return -EFAULT; - } else + } else if (!vma->vm_file) { + return -EFAULT; + } else if (vma->vm_file->f_mapping != compound_head(page)->mapping) { return -EFAULT; + } return vma_address(page, vma); } -- 2.32.0.rc0.204.g9fa02ecfa5-goog