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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 7D47DC433DF for ; Tue, 25 Aug 2020 14:58:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3DC2E20786 for ; Tue, 25 Aug 2020 14:58:15 +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="vQtLeior" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DC2E20786 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 CACA48E000F; Tue, 25 Aug 2020 10:58:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5DCA8D0001; Tue, 25 Aug 2020 10:58:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4BD48E000F; Tue, 25 Aug 2020 10:58:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0183.hostedemail.com [216.40.44.183]) by kanga.kvack.org (Postfix) with ESMTP id 9883E8D0001 for ; Tue, 25 Aug 2020 10:58:14 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 57969181AEF23 for ; Tue, 25 Aug 2020 14:58:14 +0000 (UTC) X-FDA: 77189396508.01.nose22_3801ee12705c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 2329C100462EF for ; Tue, 25 Aug 2020 14:58:14 +0000 (UTC) X-HE-Tag: nose22_3801ee12705c X-Filterd-Recvd-Size: 6326 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Tue, 25 Aug 2020 14:58:13 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id x25so7552279pff.4 for ; Tue, 25 Aug 2020 07:58:13 -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=mSzVBpitc24aVru+Z5sqZmf0BwSZbFvBZc52kq4fALc=; b=vQtLeiorPiM+mBnb60jbbLATWdt1MHtxT3cLtj/RriJ8o1jdz7rkP3YQoG8mJWp8io LS8Dn6rf+7FDGByZFvEN2Fvj765mPOq6rs5PxtVpnNKAnP+HpRPZEGtxlZ4w7c+4GIgm ezgfbHhGIlzBhl9CqOSnbIsXRE5mnjIqpNFVmnXuNc6PzLygdIFXRQ5p2XVvInqQQ0lO 2yl8BqFp93HPQDWY6blFQJainUjJoxR/yKxm5FkwT715afuzUyduhXOJYRKlwe8TAjes P7xVYKEM9pYt5n5N5z4cdA2mKYCcpZb5B8iOuU36TX3QTyiEkX6JW7/V6JZZlxdFBQw7 8HRQ== 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=mSzVBpitc24aVru+Z5sqZmf0BwSZbFvBZc52kq4fALc=; b=AI498TVCHzWLTfshbcHfk1Eq/9dSMHa7MQMQc7wxriEWTrgYEA/52H+DbjiSbYy+ff 4PMTQnTtZC6/AoZuZblRLBnKYNGdK8SngpLOYJrUvZ4DiB2yCkf2ufqOIynzsidEbnVu HvJGGDRY3/Pq6V8nW2dQiiTNq/ugg9y3m+gaJsjLJOflb24nWZqhoBEJm2aJlCHWV937 kHxkYxAN1Y6DWSuksALRKIrFHr8Gd8mx9Y9G/KGaGGKCaZ224vbs47h3CBMH7MCqjshg N3fhXSuR0in0R3YErgtM6tx8JNfJZckohuknelckZ0nze7GLTn77uD6tl2SOHblVdFiU 8rTA== X-Gm-Message-State: AOAM533uW8fRTaj9tFqBmzKcDJBeZjxdk8Y4bmGmgS0c596tDf9dhweF Koj/pG45UxXKKiJC8NOZG19L1gTo3h8= X-Google-Smtp-Source: ABdhPJx8/sy89f7MYqPfGwfXfZYI+WaeFxgwudoUWCZ36ogQX+u6vunFQp0u1doW3+kcOJej62M5Pg== X-Received: by 2002:a17:902:7790:: with SMTP id o16mr7580684pll.299.1598367492650; Tue, 25 Aug 2020 07:58:12 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (61-68-212-105.tpgi.com.au. [61.68.212.105]) by smtp.gmail.com with ESMTPSA id e29sm15755956pfj.92.2020.08.25.07.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:58:12 -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, linuxppc-dev@lists.ozlabs.org, Zefan Li , Jonathan Cameron , Christoph Hellwig , Christophe Leroy Subject: [PATCH v7 02/12] mm: apply_to_pte_range warn and fail if a large pte is encountered Date: Wed, 26 Aug 2020 00:57:43 +1000 Message-Id: <20200825145753.529284-3-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200825145753.529284-1-npiggin@gmail.com> References: <20200825145753.529284-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2329C100462EF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable 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 | 60 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 602f4283122f..995b2e790b79 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2262,13 +2262,20 @@ static int apply_to_pmd_range(struct mm_struct *m= m, pud_t *pud, } do { next =3D pmd_addr_end(addr, end); - if (create || !pmd_none_or_clear_bad(pmd)) { - err =3D apply_to_pte_range(mm, pmd, addr, next, fn, data, - create); - 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 =3D apply_to_pte_range(mm, pmd, addr, next, fn, data, create); + if (err) + break; } while (pmd++, addr =3D next, addr !=3D end); + return err; } =20 @@ -2289,13 +2296,20 @@ static int apply_to_pud_range(struct mm_struct *m= m, p4d_t *p4d, } do { next =3D pud_addr_end(addr, end); - if (create || !pud_none_or_clear_bad(pud)) { - err =3D apply_to_pmd_range(mm, pud, addr, next, fn, data, - create); - 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 =3D apply_to_pmd_range(mm, pud, addr, next, fn, data, create); + if (err) + break; } while (pud++, addr =3D next, addr !=3D end); + return err; } =20 @@ -2316,13 +2330,20 @@ static int apply_to_p4d_range(struct mm_struct *m= m, pgd_t *pgd, } do { next =3D p4d_addr_end(addr, end); - if (create || !p4d_none_or_clear_bad(p4d)) { - err =3D apply_to_pud_range(mm, p4d, addr, next, fn, data, - create); - 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 =3D apply_to_pud_range(mm, p4d, addr, next, fn, data, create); + if (err) + break; } while (p4d++, addr =3D next, addr !=3D end); + return err; } =20 @@ -2341,8 +2362,15 @@ static int __apply_to_page_range(struct mm_struct = *mm, unsigned long addr, pgd =3D pgd_offset(mm, addr); do { next =3D pgd_addr_end(addr, end); - if (!create && pgd_none_or_clear_bad(pgd)) + if (pgd_none(*pgd) && !create) continue; + 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 =3D apply_to_p4d_range(mm, pgd, addr, next, fn, data, create); if (err) break; --=20 2.23.0