From patchwork Tue Jun 12 00:51:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138282 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4709532lji; Mon, 11 Jun 2018 18:07:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLN53FzbZ77yuFERlVPIWKjGcDQVsDvjg+Ni3u72z2rj7/q4g+FICZj257j4Zce7hpsczQR X-Received: by 2002:ac8:855:: with SMTP id x21-v6mr1540887qth.42.1528765642969; Mon, 11 Jun 2018 18:07:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528765642; cv=none; d=google.com; s=arc-20160816; b=sqfAF20iWlBVYW0YksqjCROD+NHmufQH6PiPxqH9umT5B01Kvn1tqkwiudFsakfs+Q VLkLL03ezd9qUJv8guZI55Cg2liZpZoRLz76dDjfVzrwJ5OhvSWxeA9p6+4i/jqpnLCZ GnYTUph4jSLMCOmixgpjsAoCReUWcc6nvfSoq84JNLqy/yPFGwoqYzPVFGsqX8ZsfUy7 yFlep/SOhf0Z7YWDeMW++f1tospSshk/BpTXNmmcaaN81an7PlbH/pP6D2/ebt8mPB8q rQzUFZIjFgDEaP8PJn1qVf76IYVmXamfIjLKE/xtgwjWYyZzRd48k6/4j2BZ66oskYsE C36A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=w3OhhwzXmiCocExQ6RAX8gk5UKnmzB9QSB7Nc++/r+4=; b=K4ZimkfukNWmaKkmNbS89dvSQTvOGT6g7X7Mi+WCGJy0NBZHQX5SO4cyyp+xb9LZxg U9NtYPbNvF8lDYCGcouiK91T/A4Tjy04VlAgrfuN2mArXEQKEEEPD3neJK4Di9OIsLAN TNWv7j6R34XnJWMptBaUjVMkxy0iK3yohYxuRDstVoDlQn3jRhuCJzv6vodC1FROhLo0 HoKufQ2ABp0OpZNBiMfDiI2cFNxiwHw24jEV8Cglz3clmdR2MvIRoXTSo6tU3CBy2gMX 7gyL4AecSa95OaQoXdUrKIP3mGSWQ8YOo2fVXLszrCrhtWkgd6pBfHTLJ6pyHwogZX3+ WoCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V4u3tlmv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d36-v6si1074671qvh.276.2018.06.11.18.07.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Jun 2018 18:07:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V4u3tlmv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXmM-0008NG-CM for patch@linaro.org; Mon, 11 Jun 2018 21:07:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXXm-0005D9-Mp for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:52:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSXXl-0007a5-Ff for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:52:18 -0400 Received: from mail-pg0-x230.google.com ([2607:f8b0:400e:c05::230]:46959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSXXl-0007ZO-8O for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:52:17 -0400 Received: by mail-pg0-x230.google.com with SMTP id d2-v6so10588635pga.13 for ; Mon, 11 Jun 2018 17:52:17 -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; bh=w3OhhwzXmiCocExQ6RAX8gk5UKnmzB9QSB7Nc++/r+4=; b=V4u3tlmvn1uHbCFZOp1oASrdPEg4hVfEOKEuO8yiO/gk5S2cUM+N1fW/KGigggHvpL f0WwxpzTj4JcF+wah8h/iqMUWPC0LaS32lYJODk+gymcal0G3G7Opp5xx9q6f9a/eG2W KDGmna6zA7TpFqNK5L0H4PY4JSif5h0QUHFMw= 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; bh=w3OhhwzXmiCocExQ6RAX8gk5UKnmzB9QSB7Nc++/r+4=; b=YDrJKyLwAX6O1//TqAROzmIwx7lWEkcCWo8MKIGAvCuf719nT/gVGYC6e5206OAzJa GQzH+oY3gyZM/Zzd4YU3Y3ayU9xi4KeasDF6UnnVs3D+99YWAKX+BZZWUyd9L/gNm9D6 XTWYyMJxYhOInE9UbVWA83esVbHiyljWdXiaQTgYqZpCgid3/8nk8qOMNE9nuCboRi+A aQxGwvjg1LgpCbCbJV6qSBoUON9fC8a1XmAM+L7obyOhXK+Wl0+KYwBqu7FPDbQvpY41 sY6a7rRButd97L0oUR+I5f/Yfx3/bST1C3HBAQWSyXL1reSmGxfRqnTXbV4q4YsOHERh Y5WQ== X-Gm-Message-State: APt69E2KslPipBY5Z0EPw1S9JE7St8/EGVJjZlvUYfwixRB3PAYcXpEg nRv9kVrF2qW7bPf3eZZnhu8nF2wSimw= X-Received: by 2002:a65:611a:: with SMTP id z26-v6mr1191467pgu.61.1528764735822; Mon, 11 Jun 2018 17:52:15 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id l26-v6sm43362802pgn.55.2018.06.11.17.52.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 17:52:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2018 14:51:37 -1000 Message-Id: <20180612005145.3375-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612005145.3375-1-richard.henderson@linaro.org> References: <20180612005145.3375-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::230 Subject: [Qemu-devel] [PATCH v3 11/19] 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: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/syscall.c | 60 ++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) -- 2.17.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5a17803732..fd8d48b0da 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8865,8 +8865,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, how = SIG_SETMASK; break; default: - ret = -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } mask = arg2; target_to_host_old_sigset(&set, &mask); @@ -8893,8 +8892,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, how = SIG_SETMASK; break; default: - ret = -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } if (!(p = lock_user(VERIFY_READ, arg2, sizeof(target_sigset_t), 1))) return -TARGET_EFAULT; @@ -8937,8 +8935,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, how = SIG_SETMASK; break; default: - ret = -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } if (!(p = lock_user(VERIFY_READ, arg2, sizeof(target_sigset_t), 1))) return -TARGET_EFAULT; @@ -9227,15 +9224,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, ret = copy_from_user_fdset_ptr(&rfds, &rfds_ptr, rfd_addr, n); if (ret) { - goto fail; + return ret; } ret = copy_from_user_fdset_ptr(&wfds, &wfds_ptr, wfd_addr, n); if (ret) { - goto fail; + return ret; } ret = copy_from_user_fdset_ptr(&efds, &efds_ptr, efd_addr, n); if (ret) { - goto fail; + return ret; } /* @@ -9268,8 +9265,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, sig.set = &set; if (arg_sigsize != sizeof(*target_sigset)) { /* Like the kernel, we enforce correct size sigsets */ - ret = -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } target_sigset = lock_user(VERIFY_READ, arg_sigset, sizeof(*target_sigset), 1); @@ -9700,17 +9696,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 = -TARGET_EINVAL; if (len < 0) { - goto fail; + return -TARGET_EINVAL; } if (len == 0) { return 0; } p = lock_user(VERIFY_WRITE, arg2, arg3, 0); if (!p) { - ret = -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } ret = get_errno(sys_syslog((int)arg1, p, (int)arg3)); unlock_user(p, arg2, arg3); @@ -10056,8 +10050,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, dirp = g_try_malloc(count); if (!dirp) { - ret = -TARGET_ENOMEM; - goto fail; + return -TARGET_ENOMEM; } ret = get_errno(sys_getdents(arg1, dirp, count)); @@ -10456,7 +10449,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; @@ -10903,8 +10896,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, grouplist = alloca(gidsetsize * sizeof(gid_t)); target_grouplist = lock_user(VERIFY_READ, arg2, gidsetsize * sizeof(target_id), 1); if (!target_grouplist) { - ret = -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for (i = 0; i < gidsetsize; i++) { grouplist[i] = low2highgid(tswapid(target_grouplist[i])); @@ -11162,8 +11154,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, how = SIG_SETMASK; break; default: - ret = -TARGET_EINVAL; - goto fail; + return -TARGET_EINVAL; } mask = arg2; target_to_host_old_sigset(&set, &mask); @@ -11211,8 +11202,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, if (!is_error(ret)) { target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize * 4, 0); if (!target_grouplist) { - ret = -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for(i = 0;i < ret; i++) target_grouplist[i] = tswap32(grouplist[i]); @@ -11232,8 +11222,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, grouplist = alloca(gidsetsize * sizeof(gid_t)); target_grouplist = lock_user(VERIFY_READ, arg2, gidsetsize * 4, 1); if (!target_grouplist) { - ret = -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } for(i = 0;i < gidsetsize; i++) grouplist[i] = tswap32(target_grouplist[i]); @@ -11308,20 +11297,17 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR_mincore case TARGET_NR_mincore: { - void *a; - ret = -TARGET_ENOMEM; - a = lock_user(VERIFY_READ, arg1, arg2, 0); + void *a = lock_user(VERIFY_READ, arg1, arg2, 0); if (!a) { - goto fail; + return -TARGET_ENOMEM; } - ret = -TARGET_EFAULT; p = lock_user_string(arg3); if (!p) { - goto mincore_fail; + ret = -TARGET_EFAULT; + } else { + ret = get_errno(mincore(a, arg2, p)); + unlock_user(p, arg3, ret); } - ret = get_errno(mincore(a, arg2, p)); - unlock_user(p, arg3, ret); - mincore_fail: unlock_user(a, arg1, 0); } return ret; @@ -11787,8 +11773,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, ret = get_errno(sys_utimensat(arg1, NULL, tsp, arg4)); else { if (!(p = lock_user_string(arg2))) { - ret = -TARGET_EFAULT; - goto fail; + return -TARGET_EFAULT; } ret = get_errno(sys_utimensat(arg1, path(p), tsp, arg4)); unlock_user(p, arg2, 0); @@ -12424,7 +12409,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, gemu_log("qemu: Unsupported syscall: %d\n", num); return -TARGET_ENOSYS; } -fail: return ret; }