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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 E9DD9C43461 for ; Sat, 17 Apr 2021 17:26:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB0C56109F for ; Sat, 17 Apr 2021 17:26:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236833AbhDQR1I (ORCPT ); Sat, 17 Apr 2021 13:27:08 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:55863 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236820AbhDQR1H (ORCPT ); Sat, 17 Apr 2021 13:27:07 -0400 X-Originating-IP: 2.7.49.219 Received: from [192.168.1.12] (lfbn-lyo-1-457-219.w2-7.abo.wanadoo.fr [2.7.49.219]) (Authenticated sender: alex@ghiti.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 39881E0003; Sat, 17 Apr 2021 17:26:37 +0000 (UTC) Subject: Re: [PATCH] riscv: Protect kernel linear mapping only if CONFIG_STRICT_KERNEL_RWX is set To: Palmer Dabbelt Cc: anup@brainfault.org, corbet@lwn.net, Paul Walmsley , aou@eecs.berkeley.edu, Arnd Bergmann , aryabinin@virtuozzo.com, glider@google.com, dvyukov@google.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-arch@vger.kernel.org, linux-mm@kvack.org References: From: Alex Ghiti Message-ID: <72130961-0419-9b1f-e88e-aa1e933f2942@ghiti.fr> Date: Sat, 17 Apr 2021 13:26:36 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 4/16/21 à 12:33 PM, Palmer Dabbelt a écrit : > On Fri, 16 Apr 2021 03:47:19 PDT (-0700), alex@ghiti.fr wrote: >> Hi Anup, >> >> Le 4/16/21 à 6:41 AM, Anup Patel a écrit : >>> On Thu, Apr 15, 2021 at 4:34 PM Alexandre Ghiti wrote: >>>> >>>> If CONFIG_STRICT_KERNEL_RWX is not set, we cannot set different >>>> permissions >>>> to the kernel data and text sections, so make sure it is defined before >>>> trying to protect the kernel linear mapping. >>>> >>>> Signed-off-by: Alexandre Ghiti >>> >>> Maybe you should add "Fixes:" tag in commit tag ? >> >> Yes you're right I should have done that. Maybe Palmer will squash it as >> it just entered for-next? > > Ya, I'll do it.  My testing box was just tied up last night for the rc8 > PR, so I threw this on for-next to get the buildbots to take a look. > It's a bit too late to take something for this week, as I try to be > pretty conservative this late in the cycle.  There's another kprobes fix > on the list so if we end up with an rc8 I might send this along with > that, otherwise this'll just go onto for-next before the linear map > changes that exercise the bug. > > You're more than welcome to just dig up the fixes tag and reply, my > scripts pull all tags from replies (just like Revieweb-by).  Otherwise > I'll do it myself, most people don't really post Fixes tags that > accurately so I go through it for pretty much everything anyway. Here it is: Fixes: 4b67f48da707 ("riscv: Move kernel mapping outside of linear mapping") Thanks, > > Thanks for sorting this out so quickly! > >> >>> >>> Otherwise it looks good. >>> >>> Reviewed-by: Anup Patel >> >> Thank you! >> >> Alex >> >>> >>> Regards, >>> Anup >>> >>>> --- >>>>   arch/riscv/kernel/setup.c | 8 ++++---- >>>>   1 file changed, 4 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c >>>> index 626003bb5fca..ab394d173cd4 100644 >>>> --- a/arch/riscv/kernel/setup.c >>>> +++ b/arch/riscv/kernel/setup.c >>>> @@ -264,12 +264,12 @@ void __init setup_arch(char **cmdline_p) >>>> >>>>          sbi_init(); >>>> >>>> -       if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) >>>> +       if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) { >>>>                  protect_kernel_text_data(); >>>> - >>>> -#if defined(CONFIG_64BIT) && defined(CONFIG_MMU) >>>> -       protect_kernel_linear_mapping_text_rodata(); >>>> +#ifdef CONFIG_64BIT >>>> +               protect_kernel_linear_mapping_text_rodata(); >>>>   #endif >>>> +       } >>>> >>>>   #ifdef CONFIG_SWIOTLB >>>>          swiotlb_init(1); >>>> -- >>>> 2.20.1 >>>> >>> >>> _______________________________________________ >>> linux-riscv mailing list >>> linux-riscv@lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/linux-riscv >>> > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv