Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp2045987pxy; Sat, 24 Apr 2021 03:36:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykwiHxuG1VBAWgJvdap+4Gqi61MomLfmBla30lzfcn6xII5SJuKQjHBI/JLbAA2RSHz+lB X-Received: by 2002:a17:906:f2c3:: with SMTP id gz3mr8574974ejb.147.1619260560477; Sat, 24 Apr 2021 03:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619260560; cv=none; d=google.com; s=arc-20160816; b=vr+Nns5DJx9P8k3hD8PWcRQrNY2NKUHzBMIeB+iT2IpNUuusYl76a2mD75hQRRQ/Ry 53/dNUA5HVG3tvs8PYGsvO1f3n88poA6IyeEJrZxZVtk3NymiOa5pUGAVcCjlknfFwpQ jHcXPMwUMQVOzo/J/nib+CZm/BIN7Zj9qPprqTgdc3dX9QAP1WxICmv52QsuREFgPtoM 6Re3RF4BQCbbMt27xIcbrZGdDx2Wnhq4CtQ6iUDhiMxjNCf/2whPNObNkIly5ukxQKQA emCtiEHXDgzJ+vM1VdF7EkwpQ0wvO9BS71riJ7sFBZ8TlSbZ20yi6AkbruWgOAWhiWsb wz8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=rD9PRQiBV54+xvgEdH/Z85mVF4z6+BJcGcKC6NGU/+4=; b=SjzshvBaSgJRhsli9d2SMUHG3l6/cQOatTNptVQGp1F/KrJUzTxzKmK+fHFEw++5Yv d1nrRvut62WsMv+2C90zF7vud+i9+M2TeGgIDxI/n2Hc7jNLwD5guLQ6oPNwvHA6vyCr A94LMPNVo3IbNoREJsofndaeUKWg3WW54qVT/jDitLlXLuGWSJIUfUnj/ZNOCPg26tfc v6L17uTcnaoaeUyhZIku72zw0EVF9kGtg3Ya1etNuKV1GSpMf8jPBxV9DvhfehjtGzUt JvayMP+ekDuLg4cYcqKadmX0yvoBeXStsdZWgDTmeqkRTPA/0Qd1j8HHRS31T723Oowc v5Yw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t10si8146453edd.74.2021.04.24.03.35.36; Sat, 24 Apr 2021 03:36:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231771AbhDXKfY (ORCPT + 99 others); Sat, 24 Apr 2021 06:35:24 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:36244 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbhDXKfX (ORCPT ); Sat, 24 Apr 2021 06:35:23 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4FS6wf0yQ5z9tvrL; Sat, 24 Apr 2021 12:34:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id i8t7Nss1EpfW; Sat, 24 Apr 2021 12:34:42 +0200 (CEST) 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 4FS6wd74yTz9tvrF; Sat, 24 Apr 2021 12:34:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 97F6D8B76E; Sat, 24 Apr 2021 12:34:43 +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 JbBAbgqlwU61; Sat, 24 Apr 2021 12:34:43 +0200 (CEST) Received: from po15610vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6CA5E8B75F; Sat, 24 Apr 2021 12:34:43 +0200 (CEST) Received: by localhost.localdomain (Postfix, from userid 0) id 342BB63977; Sat, 24 Apr 2021 10:34:43 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/kasan: Fix shadow start address with modules To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Sat, 24 Apr 2021 10:34:43 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modules are now located before kernel, KASAN area has to be extended accordingly. Fixes: 80edc68e0479 ("powerpc/32s: Define a MODULE area below kernel text all the time") Fixes: 9132a2e82adc ("powerpc/8xx: Define a MODULE area below kernel text") Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/kasan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index 7355ed05e65e..3c478e5ef24c 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -19,7 +19,7 @@ #define KASAN_SHADOW_SCALE_SHIFT 3 -#if defined(CONFIG_PPC_BOOK3S_32) && defined(CONFIG_MODULES) && defined(CONFIG_STRICT_KERNEL_RWX) +#ifdef CONFIG_MODULES #define KASAN_KERN_START ALIGN_DOWN(PAGE_OFFSET - SZ_256M, SZ_256M) #else #define KASAN_KERN_START PAGE_OFFSET -- 2.25.0