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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 E1744C433DF for ; Tue, 26 May 2020 10:41:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7AB02073B for ; Tue, 26 May 2020 10:41:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7AB02073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4879F800A0; Tue, 26 May 2020 06:41:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45DDC80061; Tue, 26 May 2020 06:41:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 373BD800A0; Tue, 26 May 2020 06:41:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id 1C7BB80061 for ; Tue, 26 May 2020 06:41:48 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DB1D745B4 for ; Tue, 26 May 2020 10:41:47 +0000 (UTC) X-FDA: 76858529454.09.noise46_66f52c7c0ee41 X-HE-Tag: noise46_66f52c7c0ee41 X-Filterd-Recvd-Size: 3438 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 May 2020 10:41:47 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8BE771FB; Tue, 26 May 2020 03:41:46 -0700 (PDT) Received: from [192.168.1.84] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B0C5E3F52E; Tue, 26 May 2020 03:41:43 -0700 (PDT) Subject: Re: [PATCH 1/2] x86: mm: ptdump: Calculate effective permissions correctly To: Qian Cai , Andrew Morton Cc: Andy Lutomirski , Borislav Petkov , Dave Hansen , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , x86@kernel.org, Jan Beulich , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20200521152308.33096-1-steven.price@arm.com> <20200521152308.33096-2-steven.price@arm.com> <20200522180741.GB1337@Qians-MacBook-Air.local> From: Steven Price Message-ID: <430c8ab4-e7cd-6933-dde6-087fac6db872@arm.com> Date: Tue, 26 May 2020 11:41:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200522180741.GB1337@Qians-MacBook-Air.local> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit 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: On 22/05/2020 19:07, Qian Cai wrote: > On Thu, May 21, 2020 at 04:23:07PM +0100, Steven Price wrote: >> --- a/arch/x86/mm/dump_pagetables.c >> +++ b/arch/x86/mm/dump_pagetables.c >> @@ -249,10 +249,22 @@ static void note_wx(struct pg_state *st, unsigned long addr) >> @@ -270,16 +282,10 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, >> struct seq_file *m = st->seq; >> >> new_prot = val & PTE_FLAGS_MASK; >> + new_eff = st->prot_levels[level]; > > This will trigger, > > .config (if ever matters): > https://raw.githubusercontent.com/cailca/linux-mm/master/x86.config > > [ 104.532621] UBSAN: array-index-out-of-bounds in arch/x86/mm/dump_pagetables.c:284:27 > [ 104.542620] index -1 is out of range for type 'pgprotval_t [5]' Doh! In this case the result (new_eff) is never actually used: the -1 is used just to flush the last proper entry out, so in this case val == 0 which means the following statement sets new_eff = 0. But obviously an out-of-bounds access isn't great. Thanks for testing! The following patch should fix it up by making the assignment conditional on val != 0. Andrew: Would you like me to resend, or can you squash in the below? Steve -----8<---- diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 17aa7ac94a34..ea9010113f69 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -282,10 +282,10 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, struct seq_file *m = st->seq; new_prot = val & PTE_FLAGS_MASK; - new_eff = st->prot_levels[level]; - if (!val) new_eff = 0; + else + new_eff = st->prot_levels[level]; /* * If we have a "break" in the series, we need to flush the state that