Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp167346pxk; Fri, 11 Sep 2020 03:32:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzJsdsi79PTvEFHpYl6I/EVuvIAyHgcDQOHDfdYGwPXV28O5vti6ANcpVQjDUzVNO34+cd X-Received: by 2002:a05:6402:6c1:: with SMTP id n1mr1258253edy.215.1599820372330; Fri, 11 Sep 2020 03:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599820372; cv=none; d=google.com; s=arc-20160816; b=TEUsGqvE8oCr/V/zB7hCxmm/lN0YKY2y3MZ4d1JOVmi1rDvoH/OarEgMSVGNR8seCG dX7tx9iLKZCA3AMg6V9g20TVJI6ml5SL/cf896DKdUujDkWnJs/W4yihp7lNaPh2pNZJ ZbcQJDs/KHTx3WphmwSzrKLzxNM3dqE2xvjozJs9Q6kK5IjnUjMixUr8H2A2+myxRNbN 8LvRqluenOcyMSXp5xlIeQlRmSzQoTUeWfLj8+R/Z2K4oyk8TD9/gL7QLa322j5G5s3s riNu9xjXf9tIjC6UZiL6zNm38QgcfhPm/87TUIxGmccNUeWcZQ5DzmOzdOUmg6Nmfk5/ VM9Q== 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=kPXE1oRRHarGNvHAh/g9DjRFJRfnNpAdrYy0S9EgcWs=; b=anWjC7KsuciIVjVjFezxHEBTfuPX4C5qPpojyOp+u/l9WjRrtXef/yZNswy1jT3pVn SeapMvlSruf8lUzR2cKQOINL5AOap86MzP2HMGDzOGKz5LxlByty0vcb9ZJ67ek54Wz1 38wJgr6cHealPS2s0AYOMsJe9gWsOUHQ5a/15ykLXZ2RVxknvxuUR2oK/2a/RpaB/tGi azalSsRRH/08Do8ktoy/Uce9gv2CD631Mp+E6YitPQXVBwBjuJptd/Mn7t6EqVTpbVHi itLPylAo5Ccc7cwYYLSK1e7m55AKIrEqSR0A+UQffWuEY+s5Mx2xI2B/y0QOpVDaoj3h 8rbQ== 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 bo22si968228edb.187.2020.09.11.03.32.28; Fri, 11 Sep 2020 03:32:52 -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 S1725836AbgIKK3V (ORCPT + 99 others); Fri, 11 Sep 2020 06:29:21 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:57964 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725710AbgIKK3U (ORCPT ); Fri, 11 Sep 2020 06:29:20 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4BnsSC5dcFz9tyJN; Fri, 11 Sep 2020 12:29:15 +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 C32n8GzIk62W; Fri, 11 Sep 2020 12:29:15 +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 4BnsSC4g1Hz9tyJM; Fri, 11 Sep 2020 12:29:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A2C268B840; Fri, 11 Sep 2020 12:29:16 +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 E2SU-7mFh_ih; Fri, 11 Sep 2020 12:29:16 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EC96A8B837; Fri, 11 Sep 2020 12:29:15 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C29D465DCA; Fri, 11 Sep 2020 10:29:15 +0000 (UTC) Message-Id: <21b05f7298c1b18f73e6e5b4cd5005aafa24b6da.1599820109.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH v2] powerpc/powermac: Fix low_sleep_handler with KUAP and KUEP To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 11 Sep 2020 10:29:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org low_sleep_handler() has an hardcoded restore of segment registers that doesn't take KUAP and KUEP into account. Use head_32's load_segment_registers() routine instead. Signed-off-by: Christophe Leroy Fixes: a68c31fc01ef ("powerpc/32s: Implement Kernel Userspace Access Protection") Fixes: 31ed2b13c48d ("powerpc/32s: Implement Kernel Userspace Execution Prevention.") Cc: stable@vger.kernel.org --- v2: Added missing _GLOBAL() to load_segment_registers in head_32.S --- arch/powerpc/kernel/head_32.S | 2 +- arch/powerpc/platforms/powermac/sleep.S | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 5624db0e09a1..0f60743474a2 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -1002,7 +1002,7 @@ BEGIN_MMU_FTR_SECTION END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS) blr -load_segment_registers: +_GLOBAL(load_segment_registers) li r0, NUM_USER_SEGMENTS /* load up user segment register values */ mtctr r0 /* for context 0 */ li r3, 0 /* Kp = 0, Ks = 0, VSID = 0 */ diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S index f9a680fdd9c4..51bfdfe85058 100644 --- a/arch/powerpc/platforms/powermac/sleep.S +++ b/arch/powerpc/platforms/powermac/sleep.S @@ -294,14 +294,7 @@ grackle_wake_up: * we do any r1 memory access as we are not sure they * are in a sane state above the first 256Mb region */ - li r0,16 /* load up segment register values */ - mtctr r0 /* for context 0 */ - lis r3,0x2000 /* Ku = 1, VSID = 0 */ - li r4,0 -3: mtsrin r3,r4 - addi r3,r3,0x111 /* increment VSID */ - addis r4,r4,0x1000 /* address of next segment */ - bdnz 3b + bl load_segment_registers sync isync -- 2.25.0