From patchwork Wed Aug 18 19:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 498945 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp976953jab; Wed, 18 Aug 2021 12:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH0aU4wu/p4qgwIEjG4nfn5UOORpT4KsKJIWdhZ8SoWBxGjV8XPZhoatcvNT6KN4Zg6/Fn X-Received: by 2002:a92:a30a:: with SMTP id a10mr7233547ili.219.1629315581334; Wed, 18 Aug 2021 12:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629315581; cv=none; d=google.com; s=arc-20160816; b=NWM8ZvEONoTrZsR/aevR509aXzg7POWiecEjlz5OLiHCM4P9GYJw7635kVqEFqhrd+ Bh+2VVmFTxfDb04JShaDWd7hFpUMy9LNG+hru7KOe1bxDJMHpE/j2fLllfVOJ/Aoh1+x eXjhpsYuTwxZH8ChxKiF/ImvhhDClGR+jlX2N+J9FPeGgtt5XdufQlz8uvcRgG1OQGME oSkgRsJleUVuH22GC3487ZALSGQEJVdgoqV5VErSQWI+VbqY/aQDsg1I8jvmYhwbgZMf /a+wRBWEgoXl/HQzLuWe12o3F+eMhGEAKwmBw+2kpOX7+XVKl9xaMumxz1v851fc4WWt lq+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:to:from :dkim-signature; bh=f2K4PGLb2oKqgETEBS112ablWl1xVg86v5mEsLdMH5A=; b=ao+EeqL8YGBCgOrYxjkm/+D6ePfV+BMIqs2oMSzvAXNh0pCiAjLkCBOXBOHn37miKX Jdi33FKanefHr53Jd9KT/rmqjjvTO0VRQyoV7OGaJgJD5TZvqpWt92kqTmlLz/8SLpTC Mo7pdWmvVqsT/lWnNe2/xTyaxzbjy/T9dfdvSZN1lu6q+4Axq7cD5tqZ2Neb8NnPLjR4 WR2WPrrNmk2RqYKKg5/X1a5e7hTa9ylyhW5Q0rzE/6Q1ez/62ReaN0XULkcj8i6ZgT/0 7nr2kXID0+6IypqhoO1M7e4HFKPcYAVF6X6mAwd7lnUyGvhh6HMJF6x4kzfoCxKGBLck 3pJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PugB75/T"; 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 s1si600234jat.65.2021.08.18.12.39.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 12:39:41 -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="PugB75/T"; 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]:41754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGRPY-0000hs-Oe for patch@linaro.org; Wed, 18 Aug 2021 15:39:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGR9o-00075s-Mx for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:23:24 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:54059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGR9n-0002iy-5r for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:23:24 -0400 Received: by mail-pj1-x1033.google.com with SMTP id j1so3287100pjv.3 for ; Wed, 18 Aug 2021 12:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=f2K4PGLb2oKqgETEBS112ablWl1xVg86v5mEsLdMH5A=; b=PugB75/Ty5GruABAsQJwikeP6pZ22I/PyAnMJaOHTz6IfVAY1PPl5K7iInSRIuA1Jz O1+uivuTZgld/z8CgZrhYR1403wChBH2P7U2Ogs3vbLQq9RCyVKcbXeEO5PLylTVKHZw 8p4ASisucrKVA1OKXALVtRAQORdt99JGdP53tm3v+2EdeWs7x2ZoO5fe4MBZN0aA043a H/BBXLM1RyWsgRnK7RHCtGgq2bZY7PiQxfYWChcBx8HotJdR7RYXhjSbX5TpK3nZGUZ5 SZYlMZMAv4dXHHEjE6wfmoW7pdrA8FfXX4ZO1zGVCBkdpTwEUnVXa3pPLui0jBf88Y75 ECtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f2K4PGLb2oKqgETEBS112ablWl1xVg86v5mEsLdMH5A=; b=WBOO++X4Qv1KHjzvnenmjebSuXX+TDyCUFv6Zve+mKQKGwcVo6Rtl0rz69cEiU6ksb c+acSqJ4IzYTvhfI+aiX8iCdO+OztxnYSCAXMXuYXepb4Qej8X3TYPV9r9Jldqr5tr0I 3Au28r9GiwaKpmZFKXuLZ1LycKjqRwBW4dfGoDFleS3l3jNEygG+ckN8MBuU5oBA05ew Viw8AxcaWhiRb37rH545wKn+bVeFzKW8wh+d1fja0aGoLLzBCmUaADPQ0y8VprapenPf 4EBLXkRlBFC9iqzSkbQSxawO8LM3q4bW7dLaphGMzry/xwF+KcpLZSnIhoMI1HG2Haew ykOw== X-Gm-Message-State: AOAM53101hPJgjsFogaPFtZqyCuBa+bwGl9LuqLikAc+ov2S/hzCOOaj 80LtuKTJ0BE7lK2/aydK9YdcEn84YIXReA== X-Received: by 2002:a17:90a:ff94:: with SMTP id hf20mr10718491pjb.64.1629314601846; Wed, 18 Aug 2021 12:23:21 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id w82sm569302pff.112.2021.08.18.12.23.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 12:23:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 47/66] linux-user: Disable more prctl subcodes Date: Wed, 18 Aug 2021 09:19:01 -1000 Message-Id: <20210818191920.390759-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818191920.390759-1-richard.henderson@linaro.org> References: <20210818191920.390759-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create a list of subcodes that we want to pass on, a list of subcodes that should not be passed on because they would affect the running qemu itself, and a list that probably could be implemented but require extra work. Do not pass on unknown subcodes. Signed-off-by: Richard Henderson --- linux-user/syscall.c | 56 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6e630745fa..e303a9da7f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6325,6 +6325,13 @@ abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) # define PR_MTE_TAG_SHIFT 3 # define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) #endif +#ifndef PR_SET_IO_FLUSHER +# define PR_SET_IO_FLUSHER 57 +# define PR_GET_IO_FLUSHER 58 +#endif +#ifndef PR_SET_SYSCALL_USER_DISPATCH +# define PR_SET_SYSCALL_USER_DISPATCH 59 +#endif static abi_long do_prctl_get_fp_mode(CPUArchState *env) { @@ -6632,13 +6639,54 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, return -TARGET_EINVAL; } return do_prctl_get_tagged_addr_ctrl(env); + + case PR_GET_DUMPABLE: + case PR_SET_DUMPABLE: + case PR_GET_KEEPCAPS: + case PR_SET_KEEPCAPS: + case PR_GET_TIMING: + case PR_SET_TIMING: + case PR_GET_TIMERSLACK: + case PR_SET_TIMERSLACK: + case PR_MCE_KILL: + case PR_MCE_KILL_GET: + case PR_GET_NO_NEW_PRIVS: + case PR_SET_NO_NEW_PRIVS: + case PR_GET_IO_FLUSHER: + case PR_SET_IO_FLUSHER: + /* Some prctl options have no pointer arguments and we can pass on. */ + return get_errno(prctl(option, arg2, arg3, arg4, arg5)); + + case PR_GET_CHILD_SUBREAPER: + case PR_SET_CHILD_SUBREAPER: + case PR_GET_SPECULATION_CTRL: + case PR_SET_SPECULATION_CTRL: + case PR_GET_TID_ADDRESS: + /* TODO */ + return -TARGET_EINVAL; + + case PR_GET_FPEXC: + case PR_SET_FPEXC: + /* Was used for SPE on PowerPC. */ + return -TARGET_EINVAL; + + case PR_GET_ENDIAN: + case PR_SET_ENDIAN: + case PR_GET_FPEMU: + case PR_SET_FPEMU: + case PR_SET_MM: case PR_GET_SECCOMP: case PR_SET_SECCOMP: - /* Disable seccomp to prevent the target disabling syscalls we need. */ - return -TARGET_EINVAL; + case PR_SET_SYSCALL_USER_DISPATCH: + case PR_GET_THP_DISABLE: + case PR_SET_THP_DISABLE: + case PR_GET_TSC: + case PR_SET_TSC: + case PR_GET_UNALIGN: + case PR_SET_UNALIGN: default: - /* Most prctl options have no pointer arguments */ - return get_errno(prctl(option, arg2, arg3, arg4, arg5)); + /* Disable to prevent the target disabling stuff we need. */ + return -TARGET_EINVAL; } }