From patchwork Sat Nov 28 15:25:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11937559 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 8EDDAC63697 for ; Sat, 28 Nov 2020 15:26:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 34026246A7 for ; Sat, 28 Nov 2020 15:26:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WC6wPXHT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34026246A7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9F5EB6B0068; Sat, 28 Nov 2020 10:26:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A5286B006C; Sat, 28 Nov 2020 10:26:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B6806B006E; Sat, 28 Nov 2020 10:26:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0103.hostedemail.com [216.40.44.103]) by kanga.kvack.org (Postfix) with ESMTP id 729E46B0068 for ; Sat, 28 Nov 2020 10:26:20 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2C398181AEF1D for ; Sat, 28 Nov 2020 15:26:20 +0000 (UTC) X-FDA: 77534203320.07.join48_2b0fa1b27391 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 08A281803F7A1 for ; Sat, 28 Nov 2020 15:26:20 +0000 (UTC) X-HE-Tag: join48_2b0fa1b27391 X-Filterd-Recvd-Size: 6521 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 15:26:19 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id 34so6660103pgp.10 for ; Sat, 28 Nov 2020 07:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a1tvGnEfaNu1rng4Q1t20sHjkYaWZdSh+BVKU9lSOv4=; b=WC6wPXHTMZemAeUyu0JGuClO6wmo82GBportC4Vc1b7ZyXn4R9ou6tkEnwexLfBLMT /PKnJPMyQQYEkSDCEN2T6x9O6EcI3hSENdRPYkpmSpdfe310NB0Q31E7zqX3HL75j9wY U9eA26iB4gKzoTEaek9y7VNf2SGiYTKhDL5InJX7JVTjqPLlEEn/5Dfe6cYzOa7w9Uwt aGOTYadRYHsJx9JAPCTdgdT079frSwMYWYL+t1TuouIW/p/VJ/ODVIlWekmYBoDkUxr9 9UMgfqqZOitGP3W9j3gjLV95JSJ7rWjY+nbiyevFMNusDZD77lDbQSADv6dcx5PSBBpx pMkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a1tvGnEfaNu1rng4Q1t20sHjkYaWZdSh+BVKU9lSOv4=; b=ZraqypS7kGoK7e/OxApUq9JiCEFN/ef661G0JwJGZzAOlkMBq0AFa/Rg4NQ5yDawH8 7SjmSbe0Stk/v31Wnbs4j0jXsv5sjXPMAfPBD9RhckQiOZcUXbLcnjvGRyiVuPDJhsoo 55DpyEeWZqi2uAcJDtdoJLfV5iVKb3pSEexoSXMnY9ipX/FSpos8xTgJZ7D9nPduTqT5 wGUayrAnn2eq88GZgqr/wYM/Rrb9x0doWdhESbQdnc/tQU2CTL4lM8XP+e2qo3ahnOmH 90r+QvkhILXnVX4scQwCgK6oNyOnXAhnkzFeMFGUW8eaWo5MDW4BivdMeVxf7EBptLSC FzTw== X-Gm-Message-State: AOAM5307LXJP+azZbOQGAg+IYwbHjcScck3/MyuptFemUMUYQLBrY8aq RhvMHCPYOUxbnGF3cQMBp4JTh3rCFDA= X-Google-Smtp-Source: ABdhPJzwJokMBj7YQcVjw/yvUqBDUzNCrnWHNIeBxJjSVn6cZOaMvc0Xn5fGL4TaXPE/v0i81ElK8g== X-Received: by 2002:a17:90a:178b:: with SMTP id q11mr16246038pja.132.1606577178587; Sat, 28 Nov 2020 07:26:18 -0800 (PST) Received: from bobo.ibm.com (193-116-103-132.tpgi.com.au. [193.116.103.132]) by smtp.gmail.com with ESMTPSA id d22sm15500173pjw.11.2020.11.28.07.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 07:26:18 -0800 (PST) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Zefan Li , Jonathan Cameron , Christoph Hellwig , Christophe Leroy Subject: [PATCH v8 02/12] mm: apply_to_pte_range warn and fail if a large pte is encountered Date: Sun, 29 Nov 2020 01:25:49 +1000 Message-Id: <20201128152559.999540-3-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20201128152559.999540-1-npiggin@gmail.com> References: <20201128152559.999540-1-npiggin@gmail.com> MIME-Version: 1.0 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: apply_to_pte_range might mistake a large pte for bad, or treat it as a page table, resulting in a crash or corruption. Add a test to warn and return error if large entries are found. Signed-off-by: Nicholas Piggin --- mm/memory.c | 66 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index c48f8df6e502..3d0f0bc5d573 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2429,13 +2429,21 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, } do { next = pmd_addr_end(addr, end); - if (create || !pmd_none_or_clear_bad(pmd)) { - err = apply_to_pte_range(mm, pmd, addr, next, fn, data, - create, mask); - if (err) - break; + if (pmd_none(*pmd) && !create) + continue; + if (WARN_ON_ONCE(pmd_leaf(*pmd))) + return -EINVAL; + if (!pmd_none(*pmd) && WARN_ON_ONCE(pmd_bad(*pmd))) { + if (!create) + continue; + pmd_clear_bad(pmd); } + err = apply_to_pte_range(mm, pmd, addr, next, + fn, data, create, mask); + if (err) + break; } while (pmd++, addr = next, addr != end); + return err; } @@ -2457,13 +2465,21 @@ static int apply_to_pud_range(struct mm_struct *mm, p4d_t *p4d, } do { next = pud_addr_end(addr, end); - if (create || !pud_none_or_clear_bad(pud)) { - err = apply_to_pmd_range(mm, pud, addr, next, fn, data, - create, mask); - if (err) - break; + if (pud_none(*pud) && !create) + continue; + if (WARN_ON_ONCE(pud_leaf(*pud))) + return -EINVAL; + if (!pud_none(*pud) && WARN_ON_ONCE(pud_bad(*pud))) { + if (!create) + continue; + pud_clear_bad(pud); } + err = apply_to_pmd_range(mm, pud, addr, next, + fn, data, create, mask); + if (err) + break; } while (pud++, addr = next, addr != end); + return err; } @@ -2485,13 +2501,21 @@ static int apply_to_p4d_range(struct mm_struct *mm, pgd_t *pgd, } do { next = p4d_addr_end(addr, end); - if (create || !p4d_none_or_clear_bad(p4d)) { - err = apply_to_pud_range(mm, p4d, addr, next, fn, data, - create, mask); - if (err) - break; + if (p4d_none(*p4d) && !create) + continue; + if (WARN_ON_ONCE(p4d_leaf(*p4d))) + return -EINVAL; + if (!p4d_none(*p4d) && WARN_ON_ONCE(p4d_bad(*p4d))) { + if (!create) + continue; + p4d_clear_bad(p4d); } + err = apply_to_pud_range(mm, p4d, addr, next, + fn, data, create, mask); + if (err) + break; } while (p4d++, addr = next, addr != end); + return err; } @@ -2511,9 +2535,17 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr, pgd = pgd_offset(mm, addr); do { next = pgd_addr_end(addr, end); - if (!create && pgd_none_or_clear_bad(pgd)) + if (pgd_none(*pgd) && !create) continue; - err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create, &mask); + if (WARN_ON_ONCE(pgd_leaf(*pgd))) + return -EINVAL; + if (!pgd_none(*pgd) && WARN_ON_ONCE(pgd_bad(*pgd))) { + if (!create) + continue; + pgd_clear_bad(pgd); + } + err = apply_to_p4d_range(mm, pgd, addr, next, + fn, data, create, &mask); if (err) break; } while (pgd++, addr = next, addr != end);