From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCE18C10F12 for ; Mon, 15 Apr 2019 19:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F51E218A1 for ; Mon, 15 Apr 2019 19:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355561; bh=Z+zRC5mWqOWSLREDEnOJhPZv1KKEsZuKcPJ2BElwfcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AH7sHXJ+f1YZQW2MMBIWeFHvFmTq2wypEs8ha1sHpP8iafR05kJuVoa0ebK6n3W4F Z5pTDn9V0NWYFHhLmkVBSBMOgDhYOmT6k31aYxHgxZaaJRGMmvWOznV3rEdSPFIs1d 8KyFjdbOmbkD+Ou8ZHfQ8zeqi+5RR0suOcHPgsws= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731429AbfDOTMk (ORCPT ); Mon, 15 Apr 2019 15:12:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:50028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731418AbfDOTMf (ORCPT ); Mon, 15 Apr 2019 15:12:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 983A6218A1; Mon, 15 Apr 2019 19:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355555; bh=Z+zRC5mWqOWSLREDEnOJhPZv1KKEsZuKcPJ2BElwfcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m6YB8B5OU5DrmNaI805zXWOCxACXvo6AdghRC86w6nBwf95ZZUNJuxHJf7c2fckrU SM2zXbmmoJmMQdz/J7zTFkYh2BSn28Wlb0L/AJOKwMRDG0H4Oq5Yu4SdrmiNMO0QS+ uhX+i653z4Y64pVsEkJqbWj+HHT/rQyjmS2x+WzE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Schnelle , Helge Deller Subject: [PATCH 5.0 064/117] parisc: also set iaoq_b in instruction_pointer_set() Date: Mon, 15 Apr 2019 21:00:34 +0200 Message-Id: <20190415183748.195504810@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183744.887851196@linuxfoundation.org> References: <20190415183744.887851196@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sven Schnelle commit f324fa58327791b2696628b31480e7e21c745706 upstream. When setting the instruction pointer on PA-RISC we also need to set the back of the instruction queue to the new offset, otherwise we will execute on instruction from the new location, and jumping back to the old location stored in iaoq_b. Signed-off-by: Sven Schnelle Signed-off-by: Helge Deller Fixes: 75ebedf1d263 ("parisc: Add HAVE_REGS_AND_STACK_ACCESS_API feature") Cc: stable@vger.kernel.org # 4.19+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/include/asm/ptrace.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/parisc/include/asm/ptrace.h +++ b/arch/parisc/include/asm/ptrace.h @@ -28,7 +28,8 @@ static inline unsigned long regs_return_ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { - regs->iaoq[0] = val; + regs->iaoq[0] = val; + regs->iaoq[1] = val + 4; } /* Query offset/name of register from its name/offset */