Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1649736pxb; Mon, 23 Aug 2021 00:55:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvuaqa2Uty6EVtqTlExfRo3m6+BlgczPiXtTVxv15tEwUEnK+VNHE4emAfSaRhPPxQXAHv X-Received: by 2002:a17:906:7691:: with SMTP id o17mr34073313ejm.485.1629705313388; Mon, 23 Aug 2021 00:55:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629705313; cv=none; d=google.com; s=arc-20160816; b=kHytv9psxi3ubftv3RSkuzV7WC5AezGm5r6mvHZo2mGtBoeZT4B+S5NjW5rWHKAqLp Guy0n3FsPm2MeYaa9qwKckYtYWIOhvdEFXQJcE95ut/bvGElj27g5KcelgqrneDR4SCM FZN3M2rnhp2fdSvI8bvn1870N2M1t+h4WrwxPHOIknGTRAz/9RmPFQOwhjXTM3hxY0QL qKtxAewBrbl1HvLIjvE0H3X4F4RnhFP9na+isKJRB/jX5lqnX/H/kxBMEHQ2ROmHLZpD 3i61ZBwhMgPr/iMFe5FBeD379ZX0rVxoxUG0v1qByqFilXCv6xvLtpQSaBd+HiWHar3c kGMQ== 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=BzbhLHDpaT9vtD1amGGnoB1YvgPyPgJSwS6eaCaRM+E=; b=goJ3JhOPUvRBf9+NqGlKcvPCtAeOMUnxqlbzg25JEQGcR2P5oWtrXeOMcbUg1JoI04 PKrmROmHi9ZFYGHy40D/D4r1EjI9JmYy3uVSi1eeS4+FGf//oT1oCvKBomBywwRWA9IX FTZP0IJ8mFCQeioSooA/8TZ3ogV9pRUXyKkwaVPSyybi0jsgd4+JVa7BCul85NzRHDJr oky4EtNxJazQjN1UBo5HoOQpS8D6IXNUW1kLJTKAoOXhom9ykw9ZnAsJ7Ih8CIVzRFlh PHIH2QgdsZs78tv4qM4n4m3uHkTRPCgPszJGzqd6vuwwijGfcpdV765MT4P8/ALpc/6L eCqQ== 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 ji7si978574ejc.451.2021.08.23.00.54.50; Mon, 23 Aug 2021 00:55:13 -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 S235293AbhHWHxv (ORCPT + 99 others); Mon, 23 Aug 2021 03:53:51 -0400 Received: from pegase2.c-s.fr ([93.17.235.10]:42475 "EHLO pegase2.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235226AbhHWHxu (ORCPT ); Mon, 23 Aug 2021 03:53:50 -0400 Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4GtPcF6vFKz9sgc; Mon, 23 Aug 2021 09:53:01 +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 8wriLflvYs7u; Mon, 23 Aug 2021 09:53:01 +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 4GtPcF5hYFz9sgS; Mon, 23 Aug 2021 09:53:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 89A398B78C; Mon, 23 Aug 2021 09:53:01 +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 xPJkXiAQoalj; Mon, 23 Aug 2021 09:53:01 +0200 (CEST) Received: from po9473vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.100]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 279FC8B784; Mon, 23 Aug 2021 09:52:53 +0200 (CEST) Received: by po9473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 6C6156BB60; Mon, 23 Aug 2021 07:52:53 +0000 (UTC) Message-Id: <3ffe7775f3fcda8e5fca6a7bc7db0b8251153c67.1629705147.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/64: Avoid link stack corruption in kexec_wait() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 23 Aug 2021 07:52:53 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use bcl 20,31,+4 instead of bl in order to preserve link stack. See commit c974809a26a1 ("powerpc/vdso: Avoid link stack corruption in __get_datapage()") for details. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/misc_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 4b761a18a74d..613509907166 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -255,7 +255,7 @@ _GLOBAL(scom970_write) * Physical (hardware) cpu id should be in r3. */ _GLOBAL(kexec_wait) - bl 1f + bcl 20,31,1f 1: mflr r5 addi r5,r5,kexec_flag-1b -- 2.25.0