From patchwork Mon Sep 14 19:48:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 517559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7BC49140134 for ; Tue, 15 Sep 2015 05:49:07 +1000 (AEST) Received: from localhost ([::1]:43211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbZkP-0002Eu-An for incoming@patchwork.ozlabs.org; Mon, 14 Sep 2015 15:49:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbZk8-0001y6-Nr for qemu-devel@nongnu.org; Mon, 14 Sep 2015 15:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbZk3-0003Dt-Lo for qemu-devel@nongnu.org; Mon, 14 Sep 2015 15:48:48 -0400 Received: from smtpbg299.qq.com ([184.105.67.99]:51760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbZk3-0003BN-D7 for qemu-devel@nongnu.org; Mon, 14 Sep 2015 15:48:43 -0400 X-QQ-mid: esmtp35t1442260106t216t22618 Received: from localhost.localdomain (unknown [223.72.67.59]) by esmtp5.qq.com (ESMTP) with id ; Tue, 15 Sep 2015 03:48:24 +0800 (CST) X-QQ-SSF: 01000000000000F0FG500F00002000H X-QQ-FEAT: uJycrHztXGTEtXaU2amiNm8Qenf2jT3v5lR7mPDAbGWociFCb1kI4synuUK0L sP6aOOWE8xtzEkxk0D3qGcSJTGTn80i/DZcvNXZebzYfc9G1/73BabCYoL5QRgBXS9towlc GEeGNYXYl1nJqL6EYoPJm8RlsEFu+YPDMj7vgf/orB3Fle5sR/DUqQ6TMTVLxoXKA6skGTI WYjyiHqc+v4KRruZyfT+/zA455tXyuPy9t34icpviUcIeoJJOGkiH X-QQ-GoodBg: 0 X-QQ-CSender: gang.chen.5i5j@qq.com From: gang.chen.5i5j@gmail.com To: riku.voipio@iki.fi, peter.maydell@linaro.org, rth@twiddle.net Date: Tue, 15 Sep 2015 03:48:03 +0800 Message-Id: <1442260083-3123-1-git-send-email-gang.chen.5i5j@gmail.com> X-Mailer: git-send-email 1.9.3 X-QQ-SENDSIZE: 520 X-QQ-FName: D330C3D478D140D6BA801E61DA9DCAFF X-QQ-LocalIP: 163.177.66.155 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 184.105.67.99 Cc: qemu-devel@nongnu.org, xili_gchen_5257@hotmail.com, Chen Gang Subject: [Qemu-devel] [PATCH v2] linux-user/signal.c: Fix several issues for target alpha 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Gang Remove useless variable err in setup_frame() and setup_rt_frame(). Add unlock_user_struct() for setup_rt_frame(). Do not call unlock_user_struct() when lock_user_struct() failed in do_rt_sigreturn(). Remove white space of label badframe in do_sigreturn(). Signed-off-by: Chen Gang --- linux-user/signal.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 502efd9..e188931 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5396,7 +5396,6 @@ static void setup_frame(int sig, struct target_sigaction *ka, { abi_ulong frame_addr, r26; struct target_sigframe *frame; - int err = 0; frame_addr = get_sigframe(ka, env, sizeof(*frame)); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { @@ -5418,20 +5417,19 @@ static void setup_frame(int sig, struct target_sigaction *ka, unlock_user_struct(frame, frame_addr, 1); - if (err) { - give_sigsegv: - if (sig == TARGET_SIGSEGV) { - ka->_sa_handler = TARGET_SIG_DFL; - } - force_sig(TARGET_SIGSEGV); - } - env->ir[IR_RA] = r26; env->ir[IR_PV] = env->pc = ka->_sa_handler; env->ir[IR_A0] = sig; env->ir[IR_A1] = 0; env->ir[IR_A2] = frame_addr + offsetof(struct target_sigframe, sc); env->ir[IR_SP] = frame_addr; + return; + +give_sigsegv: + if (sig == TARGET_SIGSEGV) { + ka->_sa_handler = TARGET_SIG_DFL; + } + force_sig(TARGET_SIGSEGV); } static void setup_rt_frame(int sig, struct target_sigaction *ka, @@ -5440,7 +5438,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, { abi_ulong frame_addr, r26; struct target_rt_sigframe *frame; - int i, err = 0; + int i; frame_addr = get_sigframe(ka, env, sizeof(*frame)); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { @@ -5474,13 +5472,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, r26 = frame_addr; } - if (err) { - give_sigsegv: - if (sig == TARGET_SIGSEGV) { - ka->_sa_handler = TARGET_SIG_DFL; - } - force_sig(TARGET_SIGSEGV); - } + unlock_user_struct(frame, frame_addr, 1); env->ir[IR_RA] = r26; env->ir[IR_PV] = env->pc = ka->_sa_handler; @@ -5488,6 +5480,13 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, env->ir[IR_A1] = frame_addr + offsetof(struct target_rt_sigframe, info); env->ir[IR_A2] = frame_addr + offsetof(struct target_rt_sigframe, uc); env->ir[IR_SP] = frame_addr; + return; + +give_sigsegv: + if (sig == TARGET_SIGSEGV) { + ka->_sa_handler = TARGET_SIG_DFL; + } + force_sig(TARGET_SIGSEGV); } long do_sigreturn(CPUAlphaState *env) @@ -5511,7 +5510,7 @@ long do_sigreturn(CPUAlphaState *env) unlock_user_struct(sc, sc_addr, 0); return env->ir[IR_V0]; - badframe: +badframe: force_sig(TARGET_SIGSEGV); } @@ -5522,7 +5521,7 @@ long do_rt_sigreturn(CPUAlphaState *env) sigset_t set; if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { - goto badframe; + goto err; } target_to_host_sigset(&set, &frame->uc.tuc_sigmask); do_sigprocmask(SIG_SETMASK, &set, NULL); @@ -5537,9 +5536,9 @@ long do_rt_sigreturn(CPUAlphaState *env) unlock_user_struct(frame, frame_addr, 0); return env->ir[IR_V0]; - - badframe: +badframe: unlock_user_struct(frame, frame_addr, 0); +err: force_sig(TARGET_SIGSEGV); }