Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp806873pxa; Wed, 5 Aug 2020 13:15:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEWqTe1edWKMM2SpGQM+4+Dol8aV3u9xy8c4E2lWBBQzik4ccfZyrZSZyzx+aPtcg/9Y05 X-Received: by 2002:aa7:d155:: with SMTP id r21mr928982edo.87.1596658528585; Wed, 05 Aug 2020 13:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596658528; cv=none; d=google.com; s=arc-20160816; b=vuy634X7m/kqrAOFiNQmEoJKehhKWQjZqOd4XZBrrCOqH1Y+swJa8TmRRmwgiTog9l W7Zl0/qVGxxhi03I6JCP8fzB/OBMpyYo93LX4WK/qvQ+sXG/LsvzL0rzdciqizaGEHsk zHszCfoF5hCQ0oHmESRp3bZUsRvyFWivRSts7v984TblCR4nkGk58WTTpSv6KUS2uMVU dxq/ymr1zA/Pbt+pp0b2ivPq/K7xxBnMUNF+OOCcBOG6mP0pfVsqeXh2xVoQAZm0E8nV G4wmF1M+uFJfj+qjsJISz0drsjx9D3pXDp1dU2apWbGULe/qBcpFLDVrx6SYMwfYd3gw eOAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id; bh=c8RjzYq/p8/E274s1gpm+oMSpBuewEEHdZyk6hcj7DU=; b=caH9gFF1sv7tu0/TARKHfx65cuDMiSP6A7BJFCH+fG0Rhg2MiN4IYZ/gHDw66N3H8/ bHRfl0TYph/ZZb2h/KjxTXJ5OuOgLpo/x+Sxqir8t6xzH0tSWkcOo+fGTTf1UvnY8I47 2oDDD4YGg/ypOqm7rdMvE+BkjogbN/E974ozZFXVogM4UcFxpYpFjCXrGR3DcK7R6Lpy imqdYYqy0WpOFirvrlaalXguIQ+ujIMF+goyWPBCIMZJJTt9k/gxcoQam2pxPt3tUWco gVEegqtpCZlu/P9pyus1dt6ex5PwyCI4ptc+RNyDgywXqUgb84mULHAvgMeLFTbuMEUA ZuOg== 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 cc9si1885624edb.430.2020.08.05.13.15.05; Wed, 05 Aug 2020 13:15:28 -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 S1729470AbgHEUPC (ORCPT + 99 others); Wed, 5 Aug 2020 16:15:02 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:31507 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726604AbgHEQVE (ORCPT ); Wed, 5 Aug 2020 12:21:04 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4BMFqM2bGYz9vD3q; Wed, 5 Aug 2020 17:27:27 +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 L2uasisRzKAF; Wed, 5 Aug 2020 17:27:27 +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 4BMFqM116rz9vD3n; Wed, 5 Aug 2020 17:27:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 44D088B7ED; Wed, 5 Aug 2020 17:27:29 +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 aH2Oy26jO9oh; Wed, 5 Aug 2020 17:27:29 +0200 (CEST) Received: from po16052vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0FBF08B7EC; Wed, 5 Aug 2020 17:27:29 +0200 (CEST) Received: by po16052vm.idsi0.si.c-s.fr (Postfix, from userid 0) id B76FC65BC2; Wed, 5 Aug 2020 15:27:28 +0000 (UTC) Message-Id: <07884ed033c31e074747b7eb8eaa329d15db07ec.1596641219.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/32s: Fix is_module_segment() when MODULES_VADDR is defined To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 5 Aug 2020 15:27:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When MODULES_VADDR is defined, is_module_segment() shall check the address against it instead of checking agains VMALLOC_START. Fixes: 6ca055322da8 ("powerpc/32s: Use dedicated segment for modules with STRICT_KERNEL_RWX") Signed-off-by: Christophe Leroy --- arch/powerpc/mm/book3s32/mmu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c index c0162911f6cb..82ae9e06a773 100644 --- a/arch/powerpc/mm/book3s32/mmu.c +++ b/arch/powerpc/mm/book3s32/mmu.c @@ -191,10 +191,17 @@ static bool is_module_segment(unsigned long addr) { if (!IS_ENABLED(CONFIG_MODULES)) return false; +#ifdef MODULES_VADDR + if (addr < ALIGN_DOWN(MODULES_VADDR, SZ_256M)) + return false; + if (addr >= ALIGN(MODULES_END, SZ_256M)) + return false; +#else if (addr < ALIGN_DOWN(VMALLOC_START, SZ_256M)) return false; if (addr >= ALIGN(VMALLOC_END, SZ_256M)) return false; +#endif return true; } -- 2.25.0