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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 A7E24C43619 for ; Thu, 4 Mar 2021 00:08:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89A5F64FEA for ; Thu, 4 Mar 2021 00:08:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357291AbhCDAHe (ORCPT ); Wed, 3 Mar 2021 19:07:34 -0500 Received: from vmicros1.altlinux.org ([194.107.17.57]:38524 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388454AbhCCVpY (ORCPT ); Wed, 3 Mar 2021 16:45:24 -0500 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 1EBEB72C8B9; Thu, 4 Mar 2021 00:44:09 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 119137CC8A2; Thu, 4 Mar 2021 00:44:08 +0300 (MSK) Date: Thu, 4 Mar 2021 00:44:08 +0300 From: "Dmitry V. Levin" To: Andrew Morton Cc: Sergei Trofimovich , linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org Subject: Re: [PATCH] ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign Message-ID: <20210303214408.GB19445@altlinux.org> References: <20210221002554.333076-1-slyfox@gentoo.org> <20210221002554.333076-2-slyfox@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210221002554.333076-2-slyfox@gentoo.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Feb 21, 2021 at 12:25:54AM +0000, Sergei Trofimovich wrote: > In https://bugs.gentoo.org/769614 Dmitry noticed that > `ptrace(PTRACE_GET_SYSCALL_INFO)` does not return error sign properly. > > The bug is in mismatch between get/set errors: > > static inline long syscall_get_error(struct task_struct *task, > struct pt_regs *regs) > { > return regs->r10 == -1 ? regs->r8:0; > } > > static inline long syscall_get_return_value(struct task_struct *task, > struct pt_regs *regs) > { > return regs->r8; > } > > static inline void syscall_set_return_value(struct task_struct *task, > struct pt_regs *regs, > int error, long val) > { > if (error) { > /* error < 0, but ia64 uses > 0 return value */ > regs->r8 = -error; > regs->r10 = -1; > } else { > regs->r8 = val; > regs->r10 = 0; > } > } > > Tested on v5.10 on rx3600 machine (ia64 9040 CPU). > > CC: linux-ia64@vger.kernel.org > CC: linux-kernel@vger.kernel.org > CC: Andrew Morton > Reported-by: Dmitry V. Levin > Bug: https://bugs.gentoo.org/769614 > Signed-off-by: Sergei Trofimovich > --- > arch/ia64/include/asm/syscall.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h > index 6c6f16e409a8..0d23c0049301 100644 > --- a/arch/ia64/include/asm/syscall.h > +++ b/arch/ia64/include/asm/syscall.h > @@ -32,7 +32,7 @@ static inline void syscall_rollback(struct task_struct *task, > static inline long syscall_get_error(struct task_struct *task, > struct pt_regs *regs) > { > - return regs->r10 == -1 ? regs->r8:0; > + return regs->r10 == -1 ? -regs->r8:0; > } > > static inline long syscall_get_return_value(struct task_struct *task, Reviewed-by: Dmitry V. Levin -- ldv