From patchwork Tue Mar 25 06:50:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 875991 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2504954wrb; Mon, 24 Mar 2025 23:57:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaaNU4Iwq0hUSRlOAgxePbeesuNI1+QICooUqYhF4dW8OvPKKWtlXm85EhCZAvv1dkl6KqNA==@linaro.org X-Google-Smtp-Source: AGHT+IGSOvnmDRRr6R8uuQSGDsU6BuJ+smZ5ZRi0GGv/yjr3M8hqXl5+iTye897Dc6SFZHN7mNG/ X-Received: by 2002:a5d:64c7:0:b0:38f:2413:2622 with SMTP id ffacd0b85a97d-3997f9405b9mr13616786f8f.47.1742885870814; Mon, 24 Mar 2025 23:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742885870; cv=none; d=google.com; s=arc-20240605; b=FDz8RMPdMxu10GTy762/RydzCx/h5AFmBtbW6h/6WEy8llh6Q5DANqycZnZrNv7Tge iVTDTB61dVMhUT8tg0+qnodzAh6AghDdXRzK2dL5EniUW+gT91/J9q4ZnWkXzkSt7x3i URKdLJ0bG6+3i45rg/ZYrPZZl4usyEs9tmnrZNrequDMu3lxMZn+8Rm7KVoWP2pSPp5W pJ3LwfqS3scUcxaxLQ4rO7cgvhGqn2b1QuZfMoftALzF2XYL8P15VgjoYL419StxB5tl ImvVkHJ08xqjNP1y5d/DTUoWI+q5LCkGBcXpzrDSC6/CGxhgs4c/NRUpfoOomfGWVH9F S9zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to :from; bh=bIBjdFjP9FaSonh4K2S9xHme3uzcGrPSMIPK1MTEUoE=; fh=ov5PGwK6o9oDGAZqMMM9bNm8kym9ov6lFbplfKYaKOA=; b=S8Fib3Lea1hgVyYH251puAiHISqeoGTAwZbzthOEEpaYhUE1GBkvhDy0qsaeU8ziMI aSGvFpe6Esl9YV+PiX+aRLwBKtDZFdGIBE9+ivRD/On+r+i8mrZ38wYW9iTptmoobKnm YY2xCGEWh7+LFaUCUceeHm7Wg8roDOAXNAKLml133NFpH9au7AHbHKbJ6RIkgYMLM5bo 00o+9ZGre1muzfI4nKT1LJ9nkvLW7zDSQWAimWQgsxWzcKYVHSPa95y6QwAFm20Atz5P lZBWqki+eKvvtcrIED5zB6c6v1xYK4V7Ji4LMRP/03vezmAFKqgWHqtHtZ5mcEJU74Q7 +OlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3997f9d9987si7023864f8f.582.2025.03.24.23.57.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 23:57:50 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twy8m-0005Fi-6d; Tue, 25 Mar 2025 02:52:03 -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 1twy8O-00050m-S5; Tue, 25 Mar 2025 02:51:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twy8M-0001qj-Hx; Tue, 25 Mar 2025 02:51:36 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 2FA14107D70; Tue, 25 Mar 2025 09:49:29 +0300 (MSK) Received: from gandalf.tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with ESMTP id C65B81D5E7D; Tue, 25 Mar 2025 09:50:38 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id BCE0257042; Tue, 25 Mar 2025 09:50:38 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Andreas Schwab , Alistair Francis , Michael Tokarev Subject: [Stable-8.2.10 49/51] linux-user/riscv: Fix handling of cpu mask in riscv_hwprobe syscall Date: Tue, 25 Mar 2025 09:50:35 +0300 Message-Id: <20250325065038.3263786-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson The third argument of the syscall contains the size of the cpu mask in bytes, not bits. Nor is the size rounded up to a multiple of sizeof(abi_ulong). Cc: qemu-stable@nongnu.org Reported-by: Andreas Schwab Fixes: 9e1c7d982d7 ("linux-user/riscv: Add syscall riscv_hwprobe") Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis Message-ID: <20250308225902.1208237-3-richard.henderson@linaro.org> Signed-off-by: Alistair Francis (cherry picked from commit 1a010d22b7adecf0fb1c069e1e535af1aa51e9cf) Signed-off-by: Michael Tokarev diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 4dff03d2bd..15caa698b2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8906,35 +8906,38 @@ static void risc_hwprobe_fill_pairs(CPURISCVState *env, } } -static int cpu_set_valid(abi_long arg3, abi_long arg4) +/* + * If the cpumask_t of (target_cpus, cpusetsize) cannot be read: -EFAULT. + * If the cpumast_t has no bits set: -EINVAL. + * Otherwise the cpumask_t contains some bit set: 0. + * Unlike the kernel, we do not mask cpumask_t by the set of online cpus, + * nor bound the search by cpumask_size(). + */ +static int nonempty_cpu_set(abi_ulong cpusetsize, abi_ptr target_cpus) { - int ret, i, tmp; - size_t host_mask_size, target_mask_size; - unsigned long *host_mask; - - /* - * cpu_set_t represent CPU masks as bit masks of type unsigned long *. - * arg3 contains the cpu count. - */ - tmp = (8 * sizeof(abi_ulong)); - target_mask_size = ((arg3 + tmp - 1) / tmp) * sizeof(abi_ulong); - host_mask_size = (target_mask_size + (sizeof(*host_mask) - 1)) & - ~(sizeof(*host_mask) - 1); - - host_mask = alloca(host_mask_size); - - ret = target_to_host_cpu_mask(host_mask, host_mask_size, - arg4, target_mask_size); - if (ret != 0) { - return ret; - } + unsigned char *p = lock_user(VERIFY_READ, target_cpus, cpusetsize, 1); + int ret = -TARGET_EFAULT; - for (i = 0 ; i < host_mask_size / sizeof(*host_mask); i++) { - if (host_mask[i] != 0) { - return 0; + if (p) { + ret = -TARGET_EINVAL; + /* + * Since we only care about the empty/non-empty state of the cpumask_t + * not the individual bits, we do not need to repartition the bits + * from target abi_ulong to host unsigned long. + * + * Note that the kernel does not round up cpusetsize to a multiple of + * sizeof(abi_ulong). After bounding cpusetsize by cpumask_size(), + * it copies exactly cpusetsize bytes into a zeroed buffer. + */ + for (abi_ulong i = 0; i < cpusetsize; ++i) { + if (p[i]) { + ret = 0; + break; + } } + unlock_user(p, target_cpus, 0); } - return -TARGET_EINVAL; + return ret; } static abi_long do_riscv_hwprobe(CPUArchState *cpu_env, abi_long arg1, @@ -8951,7 +8954,7 @@ static abi_long do_riscv_hwprobe(CPUArchState *cpu_env, abi_long arg1, /* check cpu_set */ if (arg3 != 0) { - ret = cpu_set_valid(arg3, arg4); + ret = nonempty_cpu_set(arg3, arg4); if (ret != 0) { return ret; }