From nobody Mon Feb 9 09:33:16 2026 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=1704898692; cv=none; d=zohomail.com; s=zohoarc; b=btiL1DWZrQ0rZcCWG8Xz8AOW/GnlVnKoyC+c3E3NUWldU/vraJcYhrgtfvp+TPAAzE51hjeSDXbv1zF5PI3x3oPJdUXD68WZulJ5ckmfZYutf1ierK3Jqq1UoXXYNx468gSZzdclnLQKEbnfS1qZBITUwpeWJRB55gB5Qkl1aVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704898692; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=bdsFFJ8lQFZEbv3he064uLMOIVuwyIwIVuVBypu8+atgtwhRh6StnnTYvh//o/L20BW1c/WcOoxIvZoR192zoWnXFpovdaFC5JVAWz4+wc5LbYjArSBnt2oN9PlF/Jh9wrBcvg/i2+mi/nyGsDk+gY9IR6QPQXYmuyBx6qer4vo= 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 1704898692528662.684097493323; Wed, 10 Jan 2024 06:58:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665552.1035772 (Exim 4.92) (envelope-from ) id 1rNa1n-0007o2-7T; Wed, 10 Jan 2024 14:57:59 +0000 Received: by outflank-mailman (output) from mailman id 665552.1035772; Wed, 10 Jan 2024 14:57:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa1n-0007nt-4u; Wed, 10 Jan 2024 14:57:59 +0000 Received: by outflank-mailman (input) for mailman id 665552; Wed, 10 Jan 2024 14:57:58 +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 1rNa1m-0006ap-0Q for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:57:58 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a2cb12c9-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:57:55 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e586a62f7so5691945e9.2 for ; Wed, 10 Jan 2024 06:57:55 -0800 (PST) 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 bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.57.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:57:55 -0800 (PST) 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: a2cb12c9-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898675; x=1705503475; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=D0LbPuqJ/1GFV+QIohfs73Go3PkXyMZYCrU2EXxxKWVsn0hCXLydG7kNujrx6vMiVr GrjTu4hWoGM2an++4NtPbgezMEVdMZj7RWnjsrWkOKh9nBiCgbDSPxog6oLi54zIHmO/ O/cc5d8fNVuNDXtSvaE/SOkN7bFhREwYO6z5yUT1Wo4EULS2IkLcgjl+927LIb4ClIp2 sk7IxfyU7eAwFsO3GmtlvV8FSmASWWsIN2E0ZHHxwwYSTVtJbJdQxOR4SE/qJl6k+ZXC 6TiQiTNXNCwA4LHOupvQGD9cYetZ3fIPlpYqkFfKsgPc45T1TmnoT8CQ1m/Mlg1MtMV5 wbew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898675; x=1705503475; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=Y/8EfFScNjIIw1zIFeVRL4Mvy8h51X8pRlbTWC5DtANVWDtegZEEUUDtWNK3Yyb4gt yTP0HyQjT7R+rJHKjgzhil/TeX1L54cnBoazWm0k8F6YOpyl8vMLUk6BRjFkyW+IcVO3 0NTH+HPa2uiFbHh8WXgN48rLno3TIJNRDyE+Vhnt3lWO86RkyG9wDpwXn47RAUssLBRD eL0VY2kQmtungFYSFhreW7gA6noWawrr2N4J+bGianB/RnkUersvH6KhlHHeX1fmKztV L8W1EZxQwo6777nNtXP7XE7DIqtXK1uS2d2ORPzRyKvc3a5mujEePE0YIUlCQeqZjCr1 l4Jg== X-Gm-Message-State: AOJu0YwjwLujeBly4MYW12gXKeG/dLczJKR+UZDwCM5PK8RvaCdaw/ur LLGVtunP988pqzbfPAziKJp6hksKvTtdlcb24AQuuu0skg== X-Google-Smtp-Source: AGHT+IGqPRZUmbbDhoja1xdxE5cCCS4uoRPFgeEHEe1bFfxyBlbTW98nxPYD55HNOyyiKPXWRX0y4A== X-Received: by 2002:a05:600c:1f88:b0:40e:3511:2c39 with SMTP id je8-20020a05600c1f8800b0040e35112c39mr672943wmb.172.1704898675203; Wed, 10 Jan 2024 06:57:55 -0800 (PST) Message-ID: <37993f0d-2f53-4889-9dcb-82c34da0dba7@suse.com> Date: Wed, 10 Jan 2024 15:57:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 3/5] x86/vPIT: check values loaded from state save record Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> 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 In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704898694570100001 In particular pit_latch_status() and speaker_ioport_read() perform calculations which assume in-bounds values. Several of the state save record fields can hold wider ranges, though. Refuse to load values which cannot result from normal operation, except mode, the init state of which (see also below) cannot otherwise be reached. Note that ->gate should only be possible to be zero for channel 2; enforce that as well. Adjust pit_reset()'s writing of ->mode as well, to not unduly affect the value pit_latch_status() may calculate. The chosen mode of 7 is still one which cannot be established by writing the control word. Note that with or without this adjustment effectively all switch() statements using mode as the control expression aren't quite right when the PIT is still in that init state; there is an apparent assumption that before these can sensibly be invoked, the guest would init the PIT (i.e. in particular set the mode). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- For mode we could refuse to load values in the [0x08,0xfe] range; I'm not certain that's going to be overly helpful. For count I was considering to clip the saved value to 16 bits (i.e. to convert the internally used 0x10000 back to the architectural 0x0000), but pit_save() doesn't easily lend itself to such a "fixup". If desired perhaps better a separate change anyway. --- v3: Slightly adjust two comments. Re-base over rename in earlier patch. v2: Introduce separate checking function; switch to refusing to load bogus values. Re-base. --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -47,6 +47,7 @@ #define RW_STATE_MSB 2 #define RW_STATE_WORD0 3 #define RW_STATE_WORD1 4 +#define RW_STATE_NUM 5 =20 #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) @@ -427,6 +428,47 @@ static int cf_check pit_save(struct vcpu return rc; } =20 +static int cf_check pit_check(const struct domain *d, hvm_domain_context_t= *h) +{ + const struct hvm_hw_pit *hw; + unsigned int i; + + if ( !has_vpit(d) ) + return -ENODEV; + + hw =3D hvm_get_entry(PIT, h); + if ( !hw ) + return -ENODATA; + + /* + * Check to-be-loaded values are within valid range, for them to repre= sent + * actually reachable state. Uses of some of the values elsewhere ass= ume + * this is the case. Note that the channels' mode fields aren't check= ed; + * Xen prior to 4.19 might save them as 0xff. + */ + if ( hw->speaker_data_on > 1 || hw->pad0 ) + return -EDOM; + + for ( i =3D 0; i < ARRAY_SIZE(hw->channels); ++i ) + { + const struct hvm_hw_pit_channel *ch =3D &hw->channels[i]; + + if ( ch->count > 0x10000 || + ch->count_latched >=3D RW_STATE_NUM || + ch->read_state >=3D RW_STATE_NUM || + ch->write_state >=3D RW_STATE_NUM || + ch->rw_mode > RW_STATE_WORD0 || + ch->gate > 1 || + ch->bcd > 1 ) + return -EDOM; + + if ( i !=3D 2 && !ch->gate ) + return -EINVAL; + } + + return 0; +} + static int cf_check pit_load(struct domain *d, hvm_domain_context_t *h) { PITState *pit =3D domain_vpit(d); @@ -443,6 +485,14 @@ static int cf_check pit_load(struct doma goto out; } =20 + for ( i =3D 0; i < ARRAY_SIZE(pit->hw.channels); ++i ) + { + struct hvm_hw_pit_channel *ch =3D &pit->hw.channels[i]; + + if ( (ch->mode &=3D 7) > 5 ) + ch->mode -=3D 4; + } + /* * Recreate platform timers from hardware state. There will be some=20 * time jitter here, but the wall-clock will have jumped massively, so=20 @@ -458,7 +508,7 @@ static int cf_check pit_load(struct doma return rc; } =20 -HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, NULL, pit_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_check, pit_load, 1, HVMSR_PER= _DOM); #endif =20 /* The intercept action for PIT DM retval: 0--not handled; 1--handled. */ @@ -575,7 +625,7 @@ void pit_reset(struct domain *d) for ( i =3D 0; i < 3; i++ ) { s =3D &pit->hw.channels[i]; - s->mode =3D 0xff; /* the init mode */ + s->mode =3D 7; /* unreachable sentinel */ s->gate =3D (i !=3D 2); pit_load_count(pit, i, 0); }