From nobody Wed Nov 5 12:52:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534619232498920.7773983325224; Sat, 18 Aug 2018 12:07:12 -0700 (PDT) Received: from localhost ([::1]:40143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fr6Z1-0000vt-7O for importer@patchew.org; Sat, 18 Aug 2018 15:07:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fr6Td-0005Gj-CK for qemu-devel@nongnu.org; Sat, 18 Aug 2018 15:01:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fr6Tc-0007B7-91 for qemu-devel@nongnu.org; Sat, 18 Aug 2018 15:01:33 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:33500) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fr6Tb-0007Aa-Vy for qemu-devel@nongnu.org; Sat, 18 Aug 2018 15:01:32 -0400 Received: by mail-pg1-x542.google.com with SMTP id r64-v6so3779941pgr.0 for ; Sat, 18 Aug 2018 12:01:31 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id q85-v6sm9362783pfa.151.2018.08.18.12.01.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Aug 2018 12:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9zkXeR2EX5jvS1lDqF0b0jg60XTfD48rcxo8+2EITsk=; b=Yvriur9gCwY5yTkj39WnjdWI0HhIsK8fja3+/gRCT4yDA+fLQ70bpOLyN1Ax2OWax1 FMMIBxMztzGzxK+lCavbDPYiCUUt+BJ2xMYUTNJDOdgVizhHNa1nFUWY/NvFf7+hGXYB tSO1F/JFZ+iBiPov5EmmImluItZCLkHf74HRo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9zkXeR2EX5jvS1lDqF0b0jg60XTfD48rcxo8+2EITsk=; b=e2Mwh184vCOGFWdet2OX74TNqRcH7/GBT0bxEvy3O05tnnlPLebDcXTYZvJYD+XYDG SpBcajuM0saTotEbLGolaMVPY2mY9jIVTHdFZW6bu8Wqx6wbLuyEPGyBW4bRTNsyluCB 5o89SOqOgj7mh8w1jrxJv+4P9pXhH9g/DI5bWQIQ+ivozZwHuZ8jkz6ersKBLwc3g0qO u1tEeC6iTbhABiidO0uGqjlYR0A292aF3aTPpUNSYl0Y5Lfs9EHxibfebknl+GSMuwVo dCSSmv5VWduPK4mIZQz7gBm62OWGzWKtp0O3don0NyhNAHXUjne8YPYJqA/Cz4+J6QmL 8hdw== X-Gm-Message-State: AOUpUlFKvDewWYDUynNHCJhrcwDJ7tyidoNXBV4FBNzPuewg4UzciyGM YwsBp6IMPB1f9P747VatWgffquAl4SY= X-Google-Smtp-Source: AA+uWPyzTeLw/nCqZi4zPbxZUHTIJRNSAgy08npqYBKsLTmaepVlzXAXbUf/qv8EYsLk1hhhGWYyOw== X-Received: by 2002:a63:7c43:: with SMTP id l3-v6mr6311746pgn.311.1534618890671; Sat, 18 Aug 2018 12:01:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 18 Aug 2018 12:01:09 -0700 Message-Id: <20180818190118.12911-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180818190118.12911-1-richard.henderson@linaro.org> References: <20180818190118.12911-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v4 07/16] linux-user: Propagate goto fail to return X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/syscall.c | 60 ++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ef3b9b623c..4ae608fb19 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8910,8 +8910,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, how =3D SIG_SETMASK; break; default: - ret =3D -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } mask =3D arg2; target_to_host_old_sigset(&set, &mask); @@ -8938,8 +8937,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, how =3D SIG_SETMASK; break; default: - ret =3D -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } if (!(p =3D lock_user(VERIFY_READ, arg2, sizeof(target_sig= set_t), 1))) return -TARGET_EFAULT; @@ -8982,8 +8980,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, how =3D SIG_SETMASK; break; default: - ret =3D -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } if (!(p =3D lock_user(VERIFY_READ, arg2, sizeof(target_sig= set_t), 1))) return -TARGET_EFAULT; @@ -9273,15 +9270,15 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, =20 ret =3D copy_from_user_fdset_ptr(&rfds, &rfds_ptr, rfd_addr, n= ); if (ret) { - goto fail; + return ret; } ret =3D copy_from_user_fdset_ptr(&wfds, &wfds_ptr, wfd_addr, n= ); if (ret) { - goto fail; + return ret; } ret =3D copy_from_user_fdset_ptr(&efds, &efds_ptr, efd_addr, n= ); if (ret) { - goto fail; + return ret; } =20 /* @@ -9314,8 +9311,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, sig.set =3D &set; if (arg_sigsize !=3D sizeof(*target_sigset)) { /* Like the kernel, we enforce correct size sigset= s */ - ret =3D -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } target_sigset =3D lock_user(VERIFY_READ, arg_sigset, sizeof(*target_sigset), 1); @@ -9754,17 +9750,15 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, case TARGET_SYSLOG_ACTION_READ_CLEAR: /* Read/clear msgs */ case TARGET_SYSLOG_ACTION_READ_ALL: /* Read last messages= */ { - ret =3D -TARGET_EINVAL; if (len < 0) { - goto fail; + return -TARGET_EINVAL; } if (len =3D=3D 0) { return 0; } p =3D lock_user(VERIFY_WRITE, arg2, arg3, 0); if (!p) { - ret =3D -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } ret =3D get_errno(sys_syslog((int)arg1, p, (int)arg3)); unlock_user(p, arg2, arg3); @@ -10109,8 +10103,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, =20 dirp =3D g_try_malloc(count); if (!dirp) { - ret =3D -TARGET_ENOMEM; - goto fail; + return -TARGET_ENOMEM; } =20 ret =3D get_errno(sys_getdents(arg1, dirp, count)); @@ -10510,7 +10503,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, arg2 ? &node : NULL, NULL)); if (is_error(ret)) { - goto fail; + return ret; } if (arg1 && put_user_u32(cpu, arg1)) { return -TARGET_EFAULT; @@ -10966,8 +10959,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, grouplist =3D alloca(gidsetsize * sizeof(gid_t)); target_grouplist =3D lock_user(VERIFY_READ, arg2, gidsetsi= ze * sizeof(target_id), 1); if (!target_grouplist) { - ret =3D -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for (i =3D 0; i < gidsetsize; i++) { grouplist[i] =3D low2highgid(tswapid(target_grouplist[= i])); @@ -11225,8 +11217,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, how =3D SIG_SETMASK; break; default: - ret =3D -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } mask =3D arg2; target_to_host_old_sigset(&set, &mask); @@ -11274,8 +11265,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, if (!is_error(ret)) { target_grouplist =3D lock_user(VERIFY_WRITE, arg2, gidsets= ize * 4, 0); if (!target_grouplist) { - ret =3D -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for(i =3D 0;i < ret; i++) target_grouplist[i] =3D tswap32(grouplist[i]); @@ -11295,8 +11285,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, grouplist =3D alloca(gidsetsize * sizeof(gid_t)); target_grouplist =3D lock_user(VERIFY_READ, arg2, gidsetsize *= 4, 1); if (!target_grouplist) { - ret =3D -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for(i =3D 0;i < gidsetsize; i++) grouplist[i] =3D tswap32(target_grouplist[i]); @@ -11371,20 +11360,17 @@ static abi_long do_syscall1(void *cpu_env, int nu= m, abi_long arg1, #ifdef TARGET_NR_mincore case TARGET_NR_mincore: { - void *a; - ret =3D -TARGET_ENOMEM; - a =3D lock_user(VERIFY_READ, arg1, arg2, 0); + void *a =3D lock_user(VERIFY_READ, arg1, arg2, 0); if (!a) { - goto fail; + return -TARGET_ENOMEM; } - ret =3D -TARGET_EFAULT; p =3D lock_user_string(arg3); if (!p) { - goto mincore_fail; + ret =3D -TARGET_EFAULT; + } else { + ret =3D get_errno(mincore(a, arg2, p)); + unlock_user(p, arg3, ret); } - ret =3D get_errno(mincore(a, arg2, p)); - unlock_user(p, arg3, ret); - mincore_fail: unlock_user(a, arg1, 0); } return ret; @@ -11850,8 +11836,7 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, ret =3D get_errno(sys_utimensat(arg1, NULL, tsp, arg4)); else { if (!(p =3D lock_user_string(arg2))) { - ret =3D -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } ret =3D get_errno(sys_utimensat(arg1, path(p), tsp, arg4)); unlock_user(p, arg2, 0); @@ -12493,7 +12478,6 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num); return -TARGET_ENOSYS; } -fail: return ret; } =20 --=20 2.17.1