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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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=unavailable 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 AC4EFC43331 for ; Wed, 17 Mar 2021 06:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FACB64FAC for ; Wed, 17 Mar 2021 06:25:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbhCQGZE (ORCPT ); Wed, 17 Mar 2021 02:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbhCQGYq (ORCPT ); Wed, 17 Mar 2021 02:24:46 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC6BBC06174A; Tue, 16 Mar 2021 23:24:45 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id nh23-20020a17090b3657b02900c0d5e235a8so798466pjb.0; Tue, 16 Mar 2021 23:24:45 -0700 (PDT) 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=++PkiUNNWPZSxFQ6Sb0mw9vxh3qzOWEkVwjCIjWdkRI=; b=ajvvPRf/jAipx/skovC3jeKAcpcNl2dzAog04Ee99vI+uwnUNL3Oa+xSiOerHr/y18 xETFawp087vMSzK0HIK8ULa9i34AwtpgV28b4PHaF7n+2bzqGF6WEtnuJ6obraTqUZbQ Q7Bf8L41d5AixGe+ZV+GYcKlVNeefTpggXcBzb5nUiRVVKjqLzPPBKR8A631nVi2+q9m P5a3WLa8z4YF6DI9eQYBHOVkMIJcuIUB9UA65Bx+VnTSXtTtxLTIJtQrqX+ZcXeRhKxI mVtOAo2kDmFO+5gc4GgYH7g0Dc9Zmw9+MNhvTjjqj6tQpZVfRGOzI2Cgg2a22gO8Y13b UCMQ== 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=++PkiUNNWPZSxFQ6Sb0mw9vxh3qzOWEkVwjCIjWdkRI=; b=hyYO8p5nlu7YTpg5W1Y/BRCosjsfhtG+FwDQ9mm+iyTAPlIR5Kw7eb7T4F5MrwzB8Y OPUNFTxh2RYY+oMk9utP7iSgm4xnOmerq52yve+o8YY9gfzHODdPLAypLEAOtDYBhQtu +IQwSVy+mnLHIuPAFLvraW9nvRJXgB/rX9hHsDQM+SMSZ69ymEKy9RfMXRKRsJCJJnMg t3MUyqnfxdetVyd52waePpBShqSAwaBxuvNQQW/eAPDj15GEi8IffdNuV7cnah7xQtZ9 RPmhjm1s3rGUf5rMEKzrbQjlejkNHIeiyHryKbAqgLQaHjDn2ppKAi6AH9wbQS2nZmLN gBWQ== X-Gm-Message-State: AOAM5313WXGtrR+fv6fatKfGZYXDjOUaRZzmNAlCaCcdG1tJ8uX4A+Gw mt0w1x73AOxiBMv8teiHck4= X-Google-Smtp-Source: ABdhPJxRO/kglfO5AeKNNHy2+ogUVcnIVIzFdCXy48JSpUWwjO5ZVjhDk8TJQyAPNU8ABmQPHBgM/A== X-Received: by 2002:a17:90a:6be4:: with SMTP id w91mr3084207pjj.68.1615962285498; Tue, 16 Mar 2021 23:24:45 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (58-6-239-121.tpgi.com.au. [58.6.239.121]) by smtp.gmail.com with ESMTPSA id s19sm17959620pfh.168.2021.03.16.23.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 23:24:44 -0700 (PDT) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jonathan Cameron , Christoph Hellwig , Christophe Leroy , Rick Edgecombe , Ding Tianhong , Miaohe Lin , Christoph Hellwig Subject: [PATCH v13 03/14] mm: apply_to_pte_range warn and fail if a large pte is encountered Date: Wed, 17 Mar 2021 16:23:51 +1000 Message-Id: <20210317062402.533919-4-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210317062402.533919-1-npiggin@gmail.com> References: <20210317062402.533919-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Reviewed-by: Miaohe Lin Reviewed-by: Christoph Hellwig 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 5efa07fb6cdc..ccaf74f070c0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2446,13 +2446,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; } @@ -2474,13 +2482,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; } @@ -2502,13 +2518,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; } @@ -2528,9 +2552,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); -- 2.23.0