From patchwork Fri Nov 4 17:36:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 621382 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp411734pvb; Fri, 4 Nov 2022 10:37:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Al7/58Cnhm7G6vF/7s/+FgNNMnp/q4zHsvBeHDJRe74NgtzNsndZ+ypSt/uYP2daDTKmE X-Received: by 2002:ad4:5bac:0:b0:4bb:db4d:b60f with SMTP id 12-20020ad45bac000000b004bbdb4db60fmr30414046qvq.105.1667583438351; Fri, 04 Nov 2022 10:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667583438; cv=none; d=google.com; s=arc-20160816; b=QOZjT0qDB2lQjjPwU/YHeAGVjWHnvPQp8RG0vSfsA8Jk3/v51LC1GavjLmbSvvofZ9 nRmNr7H4g1HqGJGoNjxtJo4QSrh+F1vQIR4nkjmBjRfgWtXUkELZdgDfEA9XBTrRtXKS 4mC+GtbrFTmVbFNqMdIkBWJMFN8B/knWqftULfst2inF7R3AOz5eCaFbchZDglarpBhh X+7pY6P4ORdoTl599sq/i7FNIDSA3KIqhand8JSBz30vrCl2nFFPS8dh5D3s4OGhsWiC Nb/qFiOzmRaw7Bw02NTU60VFH04BwQa6c28Jjdc8ohSPbHsWjC/9ekzftTl8t7X5mJ1F NqCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MdSw8mOeJR96KDNysclJBr9Hm/Bb8SVdgNCy0HQjHtE=; b=EbjKbLpZBxux7pdiZzMvjtkB1MmCSXGV0MAlxI9QtBHfYmDfyJO9+nSApEoy+FlQBv OW45yAbhCCqYBIGtl3VoWlO6Je60juShmLX37HcVoi0LnYAtWa2RRJV9RGY2V6igU1BK rsUBDXuKMtOk8vcJnbvDc6qxpZc4Chv5/ErU7y4W+C+m/shPPoJIVdB8b7MQAAozdQqw D6dI/pi1BlEtEL1TMOGZvGtimz9EB6BQOAX2rYKHOM2wHFwQUTjxawVYDqGowxNKjM2s 8XDIZtIXaPUTuSiUDRV7RUHmrqZsRJtdZKcr1FVZlYK1BYulzlPrs5XCun+RijxXTPmQ dVAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ApV3fvhO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bp19-20020a05620a459300b006fa99e86c44si1325516qkb.550.2022.11.04.10.37.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Nov 2022 10:37:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ApV3fvhO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1or0co-0000PI-Nt; Fri, 04 Nov 2022 13:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1or0cl-0000OB-Gd for qemu-devel@nongnu.org; Fri, 04 Nov 2022 13:36:59 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1or0cj-0003wR-PJ for qemu-devel@nongnu.org; Fri, 04 Nov 2022 13:36:59 -0400 Received: by mail-wr1-x42d.google.com with SMTP id y16so7998229wrt.12 for ; Fri, 04 Nov 2022 10:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MdSw8mOeJR96KDNysclJBr9Hm/Bb8SVdgNCy0HQjHtE=; b=ApV3fvhO0z0wJA54VM3cu8/iVvL/y423jAd1iuaR34yju0bFv42k/rpkiN7huklYOw iTr8GRIvAJc4ho9bJ2AZdGKizqAMOQGzaOxDSvuDRKwqI/+rHHo6bQ2HYL7P8gIe4dlA QkHdIejjlx5CvwUHJ3MtL3nC21WmHbuB3f8CaAOBtZII4KVLnUqTxes7sK4HU0Rvx/GH oF9tUExgH0zFosksMHmkK/+1ZDneGH21GtEATfj7xaObpCfR4BO0Dr3sLQyzV0NqjsdH r2KDCH9TK8/JfUaeY3FoparuL3W6fYN9LYg6FsnSr6mfdb1SrGHfmWNW+XjmVocCdLKC HM7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MdSw8mOeJR96KDNysclJBr9Hm/Bb8SVdgNCy0HQjHtE=; b=fF3ti/2DWrqInHmcLtsnq9L8qzmIiAwC22TWoar05tsaezYBbQ31AZlyIumfkj36b5 S9aWA2cERfCFQyrLDCIrEosN+X2c7SjjzpoReJFRV0QcQA5dyPPFUi55hYj2M4fg/Ax7 uzM4aqWhKXYKD1cS2NAmYAkSuUDa2bvau6htA+N113FvFIlEl+dJh9X5e0/7XvEaO4dV v+SQas2QnjkliJu8XxTUGs+vffKWGDdrdC91tWQhlE0CB+9vGgMhnKefF4POB71S8gns SA5G4AlyGauApC3vykx1URCwar00Dx7HAtvFtrqFcEotDDCqX6yAZBsqJWKkxDyLnv1I bMsQ== X-Gm-Message-State: ACrzQf3Cc3/0qVla08oV2NmdVHbvPUTePCgClbMy5R9x3rFytF59mc8S wIdv0klH3XaD8LzaabUL46sTIHy+16hLcw== X-Received: by 2002:a5d:4e88:0:b0:236:590:f5a9 with SMTP id e8-20020a5d4e88000000b002360590f5a9mr21858218wru.126.1667583415810; Fri, 04 Nov 2022 10:36:55 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id n1-20020a1c7201000000b003c6c5a5a651sm13610wmc.28.2022.11.04.10.36.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Nov 2022 10:36:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Helge Deller , Drew DeVault , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 4/5] linux-user/syscall: Extract do_execve() from do_syscall1() Date: Fri, 4 Nov 2022 18:36:31 +0100 Message-Id: <20221104173632.1052-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221104173632.1052-1-philmd@linaro.org> References: <20221104173632.1052-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Drew DeVault execve() is a particular case of execveat(). In order to add do_execveat(), first factor do_execve() out. Signed-off-by: Drew DeVault Message-Id: <20221104081015.706009-1-sir@cmpwn.com> [PMD: Split of bigger patch, filled description, fixed style] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 211 +++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 24b25759be..c3ac6bb4d2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8357,6 +8357,119 @@ static int do_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, int return safe_openat(dirfd, path(pathname), flags, mode); } +static int do_execve(CPUArchState *cpu_env, + abi_long pathname, abi_long guest_argp, + abi_long guest_envp) +{ + int ret; + char **argp, **envp; + int argc, envc; + abi_ulong gp; + abi_ulong addr; + char **q; + void *p; + + argc = 0; + + for (gp = guest_argp; gp; gp += sizeof(abi_ulong)) { + if (get_user_ual(addr, gp)) { + return -TARGET_EFAULT; + } + if (!addr) { + break; + } + argc++; + } + envc = 0; + for (gp = guest_envp; gp; gp += sizeof(abi_ulong)) { + if (get_user_ual(addr, gp)) { + return -TARGET_EFAULT; + } + if (!addr) { + break; + } + envc++; + } + + argp = g_new0(char *, argc + 1); + envp = g_new0(char *, envc + 1); + + for (gp = guest_argp, q = argp; gp; gp += sizeof(abi_ulong), q++) { + if (get_user_ual(addr, gp)) { + goto execve_efault; + } + if (!addr) { + break; + } + *q = lock_user_string(addr); + if (!*q) { + goto execve_efault; + } + } + *q = NULL; + + for (gp = guest_envp, q = envp; gp; gp += sizeof(abi_ulong), q++) { + if (get_user_ual(addr, gp)) { + goto execve_efault; + } + if (!addr) { + break; + } + *q = lock_user_string(addr); + if (!*q) { + goto execve_efault; + } + } + *q = NULL; + + /* + * Although execve() is not an interruptible syscall it is + * a special case where we must use the safe_syscall wrapper: + * if we allow a signal to happen before we make the host + * syscall then we will 'lose' it, because at the point of + * execve the process leaves QEMU's control. So we use the + * safe syscall wrapper to ensure that we either take the + * signal as a guest signal, or else it does not happen + * before the execve completes and makes it the other + * program's problem. + */ + p = lock_user_string(pathname); + if (!p) { + goto execve_efault; + } + + if (is_proc_myself(p, "exe")) { + ret = get_errno(safe_execve(exec_path, argp, envp)); + } else { + ret = get_errno(safe_execve(p, argp, envp)); + } + + unlock_user(p, pathname, 0); + + goto execve_end; + +execve_efault: + ret = -TARGET_EFAULT; + +execve_end: + for (gp = guest_argp, q = argp; *q; gp += sizeof(abi_ulong), q++) { + if (get_user_ual(addr, gp) || !addr) { + break; + } + unlock_user(*q, addr, 0); + } + for (gp = guest_envp, q = envp; *q; gp += sizeof(abi_ulong), q++) { + if (get_user_ual(addr, gp) || !addr) { + break; + } + unlock_user(*q, addr, 0); + } + + g_free(argp); + g_free(envp); + return ret; +} + #define TIMER_MAGIC 0x0caf0000 #define TIMER_MAGIC_MASK 0xffff0000 @@ -8867,103 +8980,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return ret; #endif case TARGET_NR_execve: - { - char **argp, **envp; - int argc, envc; - abi_ulong gp; - abi_ulong guest_argp; - abi_ulong guest_envp; - abi_ulong addr; - char **q; - - argc = 0; - guest_argp = arg2; - for (gp = guest_argp; gp; gp += sizeof(abi_ulong)) { - if (get_user_ual(addr, gp)) - return -TARGET_EFAULT; - if (!addr) - break; - argc++; - } - envc = 0; - guest_envp = arg3; - for (gp = guest_envp; gp; gp += sizeof(abi_ulong)) { - if (get_user_ual(addr, gp)) - return -TARGET_EFAULT; - if (!addr) - break; - envc++; - } - - argp = g_new0(char *, argc + 1); - envp = g_new0(char *, envc + 1); - - for (gp = guest_argp, q = argp; gp; - gp += sizeof(abi_ulong), q++) { - if (get_user_ual(addr, gp)) - goto execve_efault; - if (!addr) - break; - if (!(*q = lock_user_string(addr))) - goto execve_efault; - } - *q = NULL; - - for (gp = guest_envp, q = envp; gp; - gp += sizeof(abi_ulong), q++) { - if (get_user_ual(addr, gp)) - goto execve_efault; - if (!addr) - break; - if (!(*q = lock_user_string(addr))) - goto execve_efault; - } - *q = NULL; - - if (!(p = lock_user_string(arg1))) - goto execve_efault; - /* Although execve() is not an interruptible syscall it is - * a special case where we must use the safe_syscall wrapper: - * if we allow a signal to happen before we make the host - * syscall then we will 'lose' it, because at the point of - * execve the process leaves QEMU's control. So we use the - * safe syscall wrapper to ensure that we either take the - * signal as a guest signal, or else it does not happen - * before the execve completes and makes it the other - * program's problem. - */ - if (is_proc_myself(p, "exe")) { - ret = get_errno(safe_execve(exec_path, argp, envp)); - } else { - ret = get_errno(safe_execve(p, argp, envp)); - } - unlock_user(p, arg1, 0); - - goto execve_end; - - execve_efault: - ret = -TARGET_EFAULT; - - execve_end: - for (gp = guest_argp, q = argp; *q; - gp += sizeof(abi_ulong), q++) { - if (get_user_ual(addr, gp) - || !addr) - break; - unlock_user(*q, addr, 0); - } - for (gp = guest_envp, q = envp; *q; - gp += sizeof(abi_ulong), q++) { - if (get_user_ual(addr, gp) - || !addr) - break; - unlock_user(*q, addr, 0); - } - - g_free(argp); - g_free(envp); - } - return ret; + return do_execve(cpu_env, arg1, arg2, arg3); case TARGET_NR_chdir: if (!(p = lock_user_string(arg1))) return -TARGET_EFAULT;