From nobody Fri Oct 31 03:41:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1750075271; cv=none; d=zohomail.com; s=zohoarc; b=M7gUVuljAKAXSfxy+ReYoq5lh41dGAlHIs5e7+GyygRbqHFTGJb+l4yYu8U88Q5GA2UND276QKq0xwwFIFIiwCXsQFT+TMqo//cSMDc3y+24HoSOPZ1X/du/zLjMhlgZRe1SDnqTnIgS9jCTHvVSABHa3gkcUFczZe8Zqn+zXas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750075271; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gbEFUj4xOp4GCpLAe55r5DawhD49OKXqVJPjz0gLjKQ=; b=n854OzPkj4kETSmPYfI7QutcEjWYitjF8aYJtNyFcmnat4qGMad/dItbkRzRdzHlxmRZf3KPM4kjzwhHtOXUUY6McjkYkhOYZWW26mYRLLMj3HJVd0+OV/Iv2R8wuUqaaa9He2uClIjYV8eTEn8A5LmiEOeEVj+SzPBG8g1sNRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1750075271788869.0642354230636; Mon, 16 Jun 2025 05:01:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1017183.1394148 (Exim 4.92) (envelope-from ) id 1uR8W5-0004vQ-Mu; Mon, 16 Jun 2025 12:00:45 +0000 Received: by outflank-mailman (output) from mailman id 1017183.1394148; Mon, 16 Jun 2025 12:00:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR8W5-0004vJ-KD; Mon, 16 Jun 2025 12:00:45 +0000 Received: by outflank-mailman (input) for mailman id 1017183; Mon, 16 Jun 2025 12:00:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR8W5-0004rC-3i for xen-devel@lists.xenproject.org; Mon, 16 Jun 2025 12:00:45 +0000 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [2a00:1450:4864:20::52b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 878b5a4b-4aa9-11f0-b894-0df219b8e170; Mon, 16 Jun 2025 14:00:43 +0200 (CEST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-6084dfb4cd5so10400281a12.0 for ; Mon, 16 Jun 2025 05:00:43 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adec88fd993sm660714066b.94.2025.06.16.05.00.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Jun 2025 05:00:42 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 878b5a4b-4aa9-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1750075243; x=1750680043; darn=lists.xenproject.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=gbEFUj4xOp4GCpLAe55r5DawhD49OKXqVJPjz0gLjKQ=; b=I2T7UWKDaxk3WbI43Eg2G8+lsn7gGHwzcI00mfEztIs3zECJdRG3e36lISMV04a3gP cpfzP9bZIFs1tDg9NhQoDmU+2AwQYx+JfLUK14Hjh3M7LiQkTy+brKt79FhVTWlVQIVV 8E/NwNiXzHmf1Nid3a/Q5+V5DyOC6/oZr1MU71hCq94tzmEo27kN1sxoo4i8ZgFFSRCG BOi1ZzzdaeePVRL52eDFVYABI1bAUGLmFFYNWscUE5m0anbqcfLTXjySIgy0qAburIyo dMEPEXl3gDI9yyGmgt+1oUqe2+yT2dlYcMqLoBG7QRGcPdsBwrjIIsfxMmp0oaHJE2LX U+WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750075243; x=1750680043; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gbEFUj4xOp4GCpLAe55r5DawhD49OKXqVJPjz0gLjKQ=; b=ZmmYZUmgk0v2wef+7feIW7jpWytpZMzP+Lp8Pgna5G1BTU8cpVdRccW1s5iCfUqAda H7Tclk2y660v9Y1DUSxgQvzZy3qzvBnAKttzvaFV6RQzRXp1JhOsx12EOBij9rEVvkAV jsizCHD+J2AQmzYJ9qqRsU03Q3hq6BHiRbk1fGjkUo7kOjkoig0DL8cLewWhGsG17Ecz 7wBOUC1P0VHe8lmsPxIp2ONkbUlW9trPiiwcjZDJ8SeAy1Ei2vVF/RtOMdHV06fuSZMQ PNXwehBvDknqqfxiJ3XGHwkM/MzfiYuCbil2HDMXk6jWuh1p5ZOhNyap/mpcm6Dq22RZ T2QA== X-Gm-Message-State: AOJu0YyyQ7jQaoTnaGzrUcT2Xe1SAsaFlh3MPwdAxa27eRjdKX1T7ysD rSQrWvBS9cBKDv5eIVuphUT+nwCHhokOJJVQkF4IzArWtsIz1pBRvwcxJwADE91mY1/r5hQrNyT i5l4= X-Gm-Gg: ASbGnctkiUU4C7tyqKFulDBAwJAEsCJ9NXFpH6XlVLHEQeYpiJ8rgeNvUmV4lcWXVzp DI4EQ/R+SatbgKyZNWPIrolL1Ay+UVZC8QPBxm9AoYbjFlYfCQ3fcKSpIugPU/iW37RG8OVj1dc E1IzNkbf5lgaRBbdDaJm2g5QfU0JfXcwlGd5IQUnF5JhazLkq75I0aErq2rTxq7d3/pkmTAZHVR 0yrsi+1zPlWxpQSz/9wAhZ1LLMoNWsuEJnKrKdFrVE6laFFqmuuOx/9pKSkbniJ6bhv67vnxWXy k85BFrQby96R7dJsIV1uZmu2s5pJ2RXy+jjbYpv9tGMHP6fe/8qRu7FOe3z09/JR2wrg4xmSDaM MNApqo1PGUR4fT1vp4R4P6RsvfIHHzRHtQjXXjwR76yti1cc= X-Google-Smtp-Source: AGHT+IFW6aGoQCp06pvgDpHVbIoriuJ9QGabn7q5z3ZAAPUJUSi37VS67E8/pcXhuvrvyF8NxD1c7g== X-Received: by 2002:a17:907:3d45:b0:ad8:89c2:423f with SMTP id a640c23a62f3a-adf4c73201amr1034122466b.7.1750075242451; Mon, 16 Jun 2025 05:00:42 -0700 (PDT) Message-ID: Date: Mon, 16 Jun 2025 14:00:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Ross Lagerwall From: Jan Beulich Subject: [PATCH] x86/pmstat: correct PMSTAT_get_pxstat buffer size checking Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1750075272937116600 Content-Type: text/plain; charset="utf-8" min(pmpt->perf.state_count, op->u.getpx.total) =3D=3D op->u.getpx.total can be expressed differently as pmpt->perf.state_count >=3D op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -272,11 +272,14 @@ int do_get_pm_info(struct xen_sysctl_get =20 cpufreq_residency_update(op->cpuid, pxpt->u.cur); =20 - ct =3D min(pmpt->perf.state_count, op->u.getpx.total + 0U); - - /* Avoid partial copying of 2-D array */ - if ( ct =3D=3D op->u.getpx.total && - copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct= ) ) + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ + ct =3D pmpt->perf.state_count; + if ( ct > op->u.getpx.total ) + ct =3D op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct= * ct) ) { spin_unlock(cpufreq_statistic_lock); ret =3D -EFAULT;