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.3 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,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 405AAC433ED for ; Mon, 17 May 2021 06:38:20 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F9E96121F for ; Mon, 17 May 2021 06:38:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F9E96121F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Fk8bF69D7z2yWR for ; Mon, 17 May 2021 16:38:17 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.235.10; helo=pegase2.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Fk8Zs2pXqz2xtr for ; Mon, 17 May 2021 16:37:54 +1000 (AEST) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Fk8Zl3qFqz9sYq; Mon, 17 May 2021 08:37:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v3pCbAgC_8q6; Mon, 17 May 2021 08:37:51 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Fk8Zl2qX1z9sYN; Mon, 17 May 2021 08:37:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 44B5C8B784; Mon, 17 May 2021 08:37:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id oDG8ORIn4yZo; Mon, 17 May 2021 08:37:51 +0200 (CEST) Received: from [172.25.230.103] (po15451.idsi0.si.c-s.fr [172.25.230.103]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0575E8B783; Mon, 17 May 2021 08:37:51 +0200 (CEST) Subject: Re: [PATCH v14 3/9] powerpc/modules: Make module_alloc() Strict Module RWX aware To: Jordan Niethe , linuxppc-dev@lists.ozlabs.org References: <20210517032810.129949-1-jniethe5@gmail.com> <20210517032810.129949-4-jniethe5@gmail.com> From: Christophe Leroy Message-ID: <04311ba7-8b91-6837-2bc5-1f55f49da253@csgroup.eu> Date: Mon, 17 May 2021 08:36:57 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210517032810.129949-4-jniethe5@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ajd@linux.ibm.com, npiggin@gmail.com, cmr@codefail.de, aneesh.kumar@linux.ibm.com, naveen.n.rao@linux.ibm.com, dja@axtens.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Le 17/05/2021 à 05:28, Jordan Niethe a écrit : > Make module_alloc() use PAGE_KERNEL protections instead of > PAGE_KERNEL_EXEX if Strict Module RWX is enabled. > > Signed-off-by: Jordan Niethe > --- > v14: - Split out from powerpc: Set ARCH_HAS_STRICT_MODULE_RWX > - Add and use strict_module_rwx_enabled() helper > --- > arch/powerpc/include/asm/mmu.h | 5 +++++ > arch/powerpc/kernel/module.c | 4 +++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h > index 607168b1aef4..7710bf0cbf8a 100644 > --- a/arch/powerpc/include/asm/mmu.h > +++ b/arch/powerpc/include/asm/mmu.h > @@ -357,6 +357,11 @@ static inline bool strict_kernel_rwx_enabled(void) > return false; > } > #endif > + > +static inline bool strict_module_rwx_enabled(void) > +{ > + return IS_ENABLED(CONFIG_STRICT_MODULE_RWX) && strict_kernel_rwx_enabled(); > +} Looking at arch/Kconfig, I have the feeling that it is possible to select CONFIG_STRICT_MODULE_RWX without selecting CONFIG_STRICT_KERNEL_RWX. In that case, strict_kernel_rwx_enabled() will return false. > #endif /* !__ASSEMBLY__ */ > > /* The kernel use the constants below to index in the page sizes array. > diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c > index 3f35c8d20be7..ed04a3ba66fe 100644 > --- a/arch/powerpc/kernel/module.c > +++ b/arch/powerpc/kernel/module.c > @@ -92,12 +92,14 @@ int module_finalize(const Elf_Ehdr *hdr, > static __always_inline void * > __module_alloc(unsigned long size, unsigned long start, unsigned long end) > { > + pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : PAGE_KERNEL_EXEC; > + > /* > * Don't do huge page allocations for modules yet until more testing > * is done. STRICT_MODULE_RWX may require extra work to support this > * too. > */ > - return __vmalloc_node_range(size, 1, start, end, GFP_KERNEL, PAGE_KERNEL_EXEC, > + return __vmalloc_node_range(size, 1, start, end, GFP_KERNEL, prot, > VM_FLUSH_RESET_PERMS | VM_NO_HUGE_VMAP, > NUMA_NO_NODE, __builtin_return_address(0)); > } >