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=-16.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,USER_AGENT_GIT 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 95A61C433B4 for ; Mon, 17 May 2021 18:54:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A408610A8 for ; Mon, 17 May 2021 18:54:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A408610A8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiO2-0007z2-FO for qemu-devel@archiver.kernel.org; Mon, 17 May 2021 14:54:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihm7-00076l-8O for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:31 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:48479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlc-0004bT-Ml for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:30 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MsrV2-1lTFHc3BmK-00tDcJ; Mon, 17 May 2021 20:14:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 57/59] linux-user: Tidy TARGET_NR_rt_sigaction Date: Mon, 17 May 2021 20:14:22 +0200 Message-Id: <20210517181424.8093-58-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:BlVMGI2zvZfRIVjR+rXCubQm5WdKvDzhBPC8hICZpzPMZ4acVYv yis88kGPYpRO63B/PJ1RsRelOMaNUVGW5es10Gu51hbiLLRwbkMG3q2PaVaRD/IR+q+vWfj Ig2htFXyinA1E0ZZzayeSiyS3l8dxPFgQgJhhOQIQX8sQtzXsBf21kyNAEKPenPYESD5hLS 0QrK9KJACNZegm+as5u5w== X-UI-Out-Filterresults: notjunk:1;V03:K0:D0wpYJislns=:QKASAKOlpjHTzRnvjt5klq rb8s4vJF/j+MPI5IDc5Io9mui1qBy29rYpUH4UoIJyZgoBabavdmOMAVr1/Byp+A6donhQrAc zc4VRLjZ5ji1LfoVq7fPDnXPKWU/D+fjOm4uu3LUnCKyaRS2f6VnkQrvrYDR8IdYnROHC2VpK ScC0aH+xb9Ds6Nc76DPzto1R10CoOAQIhcjfit0QHRAh2gdaaVe8DaSJh9O6Yq50MhLcaTrbY SsRsFk2JaiAXMVBvsVIugh1rEl4B8esFKJ7KKyeSDk4DLwru06CVYoHflDUvhHfY4vOlWD4sX ZeaJmMzw2JXktztQyc+DcZmV+SKH1gyGUDyJb1vQronwHA6HDQiCT6V0UF1aylk5BIwPB3i+V CNosD+IrwGhuoW4TRI4QkJOz+SeB1sRrg+ZlgIU8Nfl/tdHrud5/fRFH1R8Qgz/dXRQp1cqKO +RV/2tD1YRnfatIuyBHnrSSh5//bPrnfe9aZ0J3XwtJgi53ZGdGHiTgHBVFDsbzo/OBEzfkhu xTrDjjI4k2OUMkGCN4g4v4= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Initialize variables instead of elses. Use an else instead of a goto. Add braces. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210422230227.314751-8-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2c5ced1570b5..0ed58e9f5c06 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9060,32 +9060,26 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, target_ulong sigsetsize = arg4; target_ulong restorer = 0; #endif - struct target_sigaction *act; - struct target_sigaction *oact; + struct target_sigaction *act = NULL; + struct target_sigaction *oact = NULL; if (sigsetsize != sizeof(target_sigset_t)) { return -TARGET_EINVAL; } - if (arg2) { - if (!lock_user_struct(VERIFY_READ, act, arg2, 1)) { - return -TARGET_EFAULT; - } - } else { - act = NULL; + if (arg2 && !lock_user_struct(VERIFY_READ, act, arg2, 1)) { + return -TARGET_EFAULT; } - if (arg3) { - if (!lock_user_struct(VERIFY_WRITE, oact, arg3, 0)) { - ret = -TARGET_EFAULT; - goto rt_sigaction_fail; + if (arg3 && !lock_user_struct(VERIFY_WRITE, oact, arg3, 0)) { + ret = -TARGET_EFAULT; + } else { + ret = get_errno(do_sigaction(arg1, act, oact, restorer)); + if (oact) { + unlock_user_struct(oact, arg3, 1); } - } else - oact = NULL; - ret = get_errno(do_sigaction(arg1, act, oact, restorer)); - rt_sigaction_fail: - if (act) + } + if (act) { unlock_user_struct(act, arg2, 0); - if (oact) - unlock_user_struct(oact, arg3, 1); + } } return ret; #ifdef TARGET_NR_sgetmask /* not on alpha */ -- 2.31.1