From patchwork Tue Mar 29 14:29:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 8687751 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CE8CE9FD69 for ; Tue, 29 Mar 2016 14:30:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E5CA20272 for ; Tue, 29 Mar 2016 14:30:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98BEC20279 for ; Tue, 29 Mar 2016 14:30:08 +0000 (UTC) Received: from localhost ([::1]:47423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akuel-0003YC-UQ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 10:30:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akueW-0003Qr-QO for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akueR-0002Yq-QR for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:29:52 -0400 Received: from mail113-250.mail.alibaba.com ([205.204.113.250]:57877 helo=us-alimail-mta2.hst.scl.en.alidc.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akueR-0002XC-BJ for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:29:47 -0400 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.0857858|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03282; MF=chengang@emindsoft.com.cn; NM=1; PH=DS; RN=11; RT=10; SR=0; TI=SMTPD_----4eeervx_1459261754; Received: from localhost.localdomain(mailfrom:chengang@emindsoft.com.cn ip:223.72.89.125) by smtp.aliyun-inc.com(10.147.41.120); Tue, 29 Mar 2016 22:29:19 +0800 From: chengang@emindsoft.com.cn To: rth@twiddle.net, peter.maydell@linaro.org, cmetcalf@ezchip.com, laurent@vivier.eu, agraf@suse.de Date: Tue, 29 Mar 2016 22:29:10 +0800 Message-Id: <1459261750-5879-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 205.204.113.250 Cc: walt@tilera.com, Chen Gang , riku.voipio@iki.fi, qemu-devel@nongnu.org, Chen Gang Subject: [Qemu-devel] [PATCH] linux-user/signal.c: Use s390 target space address instead of host space address for restorer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chen Gang The return address is in target space, so the restorer address needs to be target space, too. Signed-off-by: Chen Gang Reviewed-by: Peter Maydell Reviewed-by: Laurent Vivier --- linux-user/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index c0a6f7e..6a73321 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -4117,8 +4117,8 @@ static void setup_frame(int sig, struct target_sigaction *ka, env->regs[14] = (unsigned long) ka->sa_restorer | PSW_ADDR_AMODE; } else { - env->regs[14] = (unsigned long) - frame->retcode | PSW_ADDR_AMODE; + env->regs[14] = (frame_addr + offsetof(sigframe, retcode)) + | PSW_ADDR_AMODE; __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, (uint16_t *)(frame->retcode)); }