From patchwork Tue Jan 9 12:14:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13514855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D9A7C47077 for ; Tue, 9 Jan 2024 12:15:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 026C96B0099; Tue, 9 Jan 2024 07:15:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F17646B0098; Tue, 9 Jan 2024 07:15:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB6FD6B0099; Tue, 9 Jan 2024 07:15:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CB67D6B0096 for ; Tue, 9 Jan 2024 07:15:16 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9F7B3C0343 for ; Tue, 9 Jan 2024 12:15:16 +0000 (UTC) X-FDA: 81659667432.22.EB5A4B7 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf15.hostedemail.com (Postfix) with ESMTP id 76102A0029 for ; Tue, 9 Jan 2024 12:15:14 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704802514; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UNwJKKPPILgaSnpgYDpInvVLOEWABiARtcGCIg6ywN8=; b=iB7O/FKlzzCXpnl6UtukF7mdnAnhG1D9kHJ2CG7N4rfDskhZLDzT173VS0s4KnDOIG6aWw X5c1aOBrCy/O6Ybljh/lRA1DE56jGDaPewRrwR3qI7Ye9wEK4v/apBnwvmPrDt3BJrUG8k h2rNQ/ODN0PxwG21wP6Sj0+NkE+ccUc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704802514; a=rsa-sha256; cv=none; b=op1mBne7eZ/duNddTbJ2iTQcrimjsyWD2VKwPxQKZOws/dMdmfnQ8whCHy5ovu8nqwSWjI vxDSKMfagAy01wy6Am8IX2AlsNf7J3UtewR4CdUpCNaSwT7E2ws6NP0btLaZhTurysZJhm FtEq/3w3GJQelripoD7pO5iaEVY7GGo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4T8VHW2g2sz9v7L; Tue, 9 Jan 2024 13:15:03 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8XzZft3ylMw5; Tue, 9 Jan 2024 13:15:03 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4T8VHW1lylz9v2V; Tue, 9 Jan 2024 13:15:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3309B8B77E; Tue, 9 Jan 2024 13:15:03 +0100 (CET) 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 e9KbMbZ3ey5e; Tue, 9 Jan 2024 13:15:03 +0100 (CET) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.126]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 94A4B8B774; Tue, 9 Jan 2024 13:15:01 +0100 (CET) From: Christophe Leroy To: linux-hardening@vger.kernel.org, Russell King , Catalin Marinas , Will Deacon , Michael Ellerman , Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Andrew Morton , Kees Cook Cc: Christophe Leroy , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-mm@kvack.org, steven.price@arm.com, Phong Tran , mark.rutland@arm.com, Greg KH Subject: [PATCH 3/4] powerpc,s390: Define ptdump_check_wx() regardless of CONFIG_DEBUG_WX Date: Tue, 9 Jan 2024 13:14:37 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704802474; l=3171; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=gAR8VjyaAG7V6eTyCXLso37q5nl2ZEcy4Y3IXEExBcI=; b=J51UzMklatGSquOss6DQxbZMh9/Fb67T2JHhLz1lpwFrSYWGcJ1wDOpaEmQDZtFgVNu/csOyt n1ORNiqAxsCAWdzF7bTDeravP/7xGeOUEa1YEh9Fy7LFTdSnsTpNTzL X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Stat-Signature: dbfqhofyfcqgnzcbtexostk43zhdpj8f X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 76102A0029 X-Rspam-User: X-HE-Tag: 1704802514-327487 X-HE-Meta: U2FsdGVkX1800JS5NUjGKbsRYF2zlidwIi7PWA9seOuJcPAvt+QeI4GpLkfDcCBsAbsHMM1apygMUYLtCiJJeHHBALXgWhMNgL0uPQCzW/bzBhL9tigKie5hg4So4OWz+hXFQ/cqz1/7p5R2p1UgY8oyu+0st7wNP4xejmxV62XmY2/kq++8FaS85pQLfQipkwRV1QBLbOD3iO/KQ8pIhWmoH4aKTN0eZOpjHLpmsrBwGtH9VuPagtGPhN47fssOioc6Fh19yCZ86aLllzxSouefk4d5qJie7DdKzq4WlDMJXlJug00BKRdTrbpSc6PJH7nzqQsaUU8QhahS7QCkFszGxf8LI8qnR07eWXluC39nViSopKngadV9T6dVCaVfJTzyhwHSiFvo/Qv7Az6SPgXYNgbHM3/2A9TBaqRLpMuF1C9H/P9SN9GnKrkKhSU9qWK339DNn3WMwqP+XxcLFee8LMpxA9biIZv7MywJsoRwh6nF9iOnKOJ05NZjadji0SZVOYecyToubmuBdT36BKaVD9Hlr2s3EiByPpe9X3KIShdD+agPZe0ebMgX3Ef5yXYnCa1QkT33vtQqVqXzFO3I5t0Af8BXLqujEZlX0hSfLX8micwF4l+o5bp5z650xsrIn9uVoiWdobo5Is4zWV3uAENDbI2HIuD01p/85f8t+QEjQSrqveOkvldX23Wde6EOTk+s2WGiaeoqD+SiVdVPc1iz7gMDkF2G64xjSnwPYT2UJDSD098Q51T1dXCHki3ZLw+NFZG+hHvfVGk2iaLXSfD7ZNk5LOtD8+Q5cwt4CmPOCJsTxB00pSOsn4Pkg48uKPMylVG03nQZbumisPTx65OojeQUFD/pSuimVUwRHC2GWdJiJNKSL43VYYwcBYvmMmqgzmrCU+q9+RTZwE13VXbaPz3anixNRu80uR61XiosxEdQ+Bf7DRgf2EJGmB1bQ+QIbfGtMkwSHbU cWmTyvHg yFEJ+c+tVjNz5vp6ACkv+PQ6OQO35UxQhV7YD+mrIxVLnQYATaWJi2O7V2CMVpVJRYXzWxD2BXcgXoYSU37UpkOnLRxi67NsuLjU5I33bmYKmyydeG19LbuECumqexmrT65GvHU+uq7CLm0hWy8iiYlcoNM5chqLO56MURZDTGO3oYcxeHoNLCPztOhqKCzNtL8cSog5Ud6HBIF/Ex+hNRHHPIAwNUptsZXQGrCmhCQOuX3l+N+hxWw2CYA== 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: List-Subscribe: List-Unsubscribe: Following patch will use ptdump_check_wx() regardless of CONFIG_DEBUG_WX, so define it at all times of powerpc and s390 just like other architectures. Though keep the WARN_ON_ONCE() only when CONFIG_DEBUG_WX is set. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/ptdump/ptdump.c | 7 +++---- arch/s390/mm/dump_pagetables.c | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c index 620d4917ebe8..b835c80371cd 100644 --- a/arch/powerpc/mm/ptdump/ptdump.c +++ b/arch/powerpc/mm/ptdump/ptdump.c @@ -184,13 +184,14 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) { pte_t pte = __pte(st->current_flags); - if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx) + if (!st->check_wx) return; if (!pte_write(pte) || !pte_exec(pte)) return; - WARN_ONCE(1, "powerpc/mm: Found insecure W+X mapping at address %p/%pS\n", + WARN_ONCE(IS_ENABLED(CONFIG_DEBUG_WX), + "powerpc/mm: Found insecure W+X mapping at address %p/%pS\n", (void *)st->start_address, (void *)st->start_address); st->wx_pages += (addr - st->start_address) / PAGE_SIZE; @@ -326,7 +327,6 @@ static void __init build_pgtable_complete_mask(void) pg_level[i].mask |= pg_level[i].flag[j].mask; } -#ifdef CONFIG_DEBUG_WX void ptdump_check_wx(void) { struct pg_state st = { @@ -354,7 +354,6 @@ void ptdump_check_wx(void) else pr_info("Checked W+X mappings: passed, no W+X pages found\n"); } -#endif static int __init ptdump_init(void) { diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c index 8dcb4e0c71bd..99da5a5602a8 100644 --- a/arch/s390/mm/dump_pagetables.c +++ b/arch/s390/mm/dump_pagetables.c @@ -121,7 +121,6 @@ static void print_prot(struct seq_file *m, unsigned int pr, int level) static void note_prot_wx(struct pg_state *st, unsigned long addr) { -#ifdef CONFIG_DEBUG_WX if (!st->check_wx) return; if (st->current_prot & _PAGE_INVALID) @@ -138,10 +137,10 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) */ if (addr == PAGE_SIZE && (nospec_uses_trampoline() || !static_key_enabled(&cpu_has_bear))) return; - WARN_ONCE(1, "s390/mm: Found insecure W+X mapping at address %pS\n", + WARN_ONCE(IS_ENABLED(CONFIG_DEBUG_WX), + "s390/mm: Found insecure W+X mapping at address %pS\n", (void *)st->start_address); st->wx_pages += (addr - st->start_address) / PAGE_SIZE; -#endif /* CONFIG_DEBUG_WX */ } static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, u64 val) @@ -193,7 +192,6 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, } } -#ifdef CONFIG_DEBUG_WX void ptdump_check_wx(void) { struct pg_state st = { @@ -226,7 +224,6 @@ void ptdump_check_wx(void) (nospec_uses_trampoline() || !static_key_enabled(&cpu_has_bear)) ? "unexpected " : ""); } -#endif /* CONFIG_DEBUG_WX */ #ifdef CONFIG_PTDUMP_DEBUGFS static int ptdump_show(struct seq_file *m, void *v)