From patchwork Sun Sep 13 03:25:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 517121 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 711E0140285 for ; Sun, 13 Sep 2015 13:26:16 +1000 (AEST) Received: from localhost ([::1]:34408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zaxvi-0003UJ-AO for incoming@patchwork.ozlabs.org; Sat, 12 Sep 2015 23:26:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaxvT-00036s-1I for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaxvP-0000SY-94 for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:25:58 -0400 Received: from smtpbg303.qq.com ([184.105.206.26]:45213) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaxvP-0000SU-0p for qemu-devel@nongnu.org; Sat, 12 Sep 2015 23:25:55 -0400 X-QQ-mid: esmtp15t1442114745t702t31840 Received: from localhost.localdomain (unknown [223.72.67.82]) by esmtp5.qq.com (ESMTP) with id ; Sun, 13 Sep 2015 11:25:44 +0800 (CST) X-QQ-SSF: 01000000000000F0FG500F00002000H X-QQ-FEAT: ay/ZZCCRjsWXoy7O6HtGr5Nt/7h0/tGGi2EfSYrD3HkXsEAcTcG4Pnz4QgHmM pvsaoHNB5j2n7uo95KpZlH3a+uOm+AU3/M0THQbadZYItnlpnBn+JutQCAka+HKt6Mhx7Rq uiRC5A2hmorfE9iTNiHmGOGl+vA5GgaO8vI/zqcSdRn9B3QBTa2ka+n5OY4wnfi2k9hDQ/x XZJwwkvkocNbIh5ylQt7Mqq5ZWceeLH/ZhG/4PIU4TA== 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:25:43 +0800 Message-Id: <1442114743-10165-1-git-send-email-gang.chen.5i5j@gmail.com> X-Mailer: git-send-email 1.9.3 X-QQ-SENDSIZE: 520 X-QQ-FName: BF1A038688DE4813BFD9D4CAD8A06A67 X-QQ-LocalIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 184.105.206.26 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 m68k 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 m68k, setup_rt_frame() and do_rt_sigreturn() have this issue. Signed-off-by: Chen Gang --- linux-user/signal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index cead97b..0265c46 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5160,7 +5160,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, frame_addr = get_sigframe(ka, env, sizeof *frame); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) - goto give_sigsegv; + goto err; __put_user(sig, &frame->sig); @@ -5215,6 +5215,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, give_sigsegv: unlock_user_struct(frame, frame_addr, 1); +err: force_sig(TARGET_SIGSEGV); } @@ -5261,7 +5262,7 @@ long do_rt_sigreturn(CPUM68KState *env) int d0; if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) - goto badframe; + goto err; target_to_host_sigset_internal(&set, &target_set); do_sigprocmask(SIG_SETMASK, &set, NULL); @@ -5281,6 +5282,7 @@ long do_rt_sigreturn(CPUM68KState *env) badframe: unlock_user_struct(frame, frame_addr, 0); +err: force_sig(TARGET_SIGSEGV); return 0; }