From patchwork Sun Sep 13 03:36:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 517122 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 E3EE71401AD for ; Sun, 13 Sep 2015 13:37:05 +1000 (AEST) Received: from localhost ([::1]:34440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zay6B-0006sn-SN for incoming@patchwork.ozlabs.org; Sat, 12 Sep 2015 23:37:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zay5w-0006c9-Hq for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:36:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zay5t-0004Mq-BX for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:36:48 -0400 Received: from smtpbg64.qq.com ([103.7.28.238]:42932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zay5s-0004MQ-Pp for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:36:45 -0400 X-QQ-mid: esmtp36t1442115394t286t01550 Received: from localhost.localdomain (unknown [223.72.67.82]) by esmtp5.qq.com (ESMTP) with id ; Sun, 13 Sep 2015 11:36:33 +0800 (CST) X-QQ-SSF: 01000000000000F0FG500F00002000H X-QQ-FEAT: wpRLW7ZVtHikZciw74hmA2mpJcsicRoR/5jb6W0V/aiiWlqwB/i6ubwFeeiBR iwx9gh6QYR1A8h6AniuTr3+LZOaJHKJQ97ttuBfMBPyKwlYTmNguIIhEWiMVfXZEzFrGbtz pEeOjg12WhPPkCvGsgCbu3REtShsoc2NFR+Hwmt9GJm+UTD44M1LgEqq+/5bZOO5MgPqoSZ VKig4pS4QOkX70k/+qXgIoxHGVHANrb5ynMzqg6+AZA== 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: Sun, 13 Sep 2015 11:36:31 +0800 Message-Id: <1442115391-18775-1-git-send-email-gang.chen.5i5j@gmail.com> X-Mailer: git-send-email 1.9.3 X-QQ-SENDSIZE: 520 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 103.7.28.238 Cc: qemu-devel@nongnu.org, xili_gchen_5257@hotmail.com, Chen Gang Subject: [Qemu-devel] [PATCH] linux-user/signal.c: Skip calling unlock_user_struct() when lock_user_struct() failed for target ppc and ppc64 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 For target ppc and ppc64, all related funcitons have this issue. Signed-off-by: Chen Gang --- linux-user/signal.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 0265c46..61f98e7 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -4666,7 +4666,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, frame_addr = get_sigframe(ka, env, sizeof(*frame)); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 1)) - goto sigsegv; + goto err; sc = &frame->sctx; __put_user(ka->_sa_handler, &sc->handler); @@ -4729,6 +4729,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, sigsegv: unlock_user_struct(frame, frame_addr, 1); +err: qemu_log("segfaulting from setup_frame\n"); force_sig(TARGET_SIGSEGV); } @@ -4748,7 +4749,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf)); if (!lock_user_struct(VERIFY_WRITE, rt_sf, rt_sf_addr, 1)) - goto sigsegv; + goto err; tswap_siginfo(&rt_sf->info, info); @@ -4825,6 +4826,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, sigsegv: unlock_user_struct(rt_sf, rt_sf_addr, 1); +err: qemu_log("segfaulting from setup_rt_frame\n"); force_sig(TARGET_SIGSEGV); @@ -4840,7 +4842,7 @@ long do_sigreturn(CPUPPCState *env) sc_addr = env->gpr[1] + SIGNAL_FRAMESIZE; if (!lock_user_struct(VERIFY_READ, sc, sc_addr, 1)) - goto sigsegv; + goto err; #if defined(TARGET_PPC64) set.sig[0] = sc->oldmask + ((uint64_t)(sc->_unused[3]) << 32); @@ -4861,8 +4863,8 @@ long do_sigreturn(CPUPPCState *env) return -TARGET_QEMU_ESIGRETURN; sigsegv: - unlock_user_struct(sr, sr_addr, 1); unlock_user_struct(sc, sc_addr, 1); +err: qemu_log("segfaulting from do_sigreturn\n"); force_sig(TARGET_SIGSEGV); return 0; @@ -4905,7 +4907,7 @@ long do_rt_sigreturn(CPUPPCState *env) rt_sf_addr = env->gpr[1] + SIGNAL_FRAMESIZE + 16; if (!lock_user_struct(VERIFY_READ, rt_sf, rt_sf_addr, 1)) - goto sigsegv; + goto err; if (do_setcontext(&rt_sf->uc, env, 1)) goto sigsegv; @@ -4919,6 +4921,7 @@ long do_rt_sigreturn(CPUPPCState *env) sigsegv: unlock_user_struct(rt_sf, rt_sf_addr, 1); +err: qemu_log("segfaulting from do_rt_sigreturn\n"); force_sig(TARGET_SIGSEGV); return 0;