From nobody Mon Sep 16 19:38:04 2024 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=1719232031; cv=none; d=zohomail.com; s=zohoarc; b=ai3WDIJE2+/9KzqM7+ie1REK/rx6fMo47LLAiVXiit6iMKYdkqC8Jk9ZjeRtF38z/zESohF3BIsZq7z3yDJ87bB2dVOpwlVQi7IJ3vJpRF45tWwrie1nJyfRo7MwYfVELRJu2dfBgqIKnwqmlyX5b7YLRylgQ9KrzV3px5A7b8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719232031; 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=BISiRXI8VY0evOcJTWm+6GCK6MEtQaD4JyxX2gs5bvE=; b=WeNUytVAeABlRIHDDkgKIFUuCyJA9fYsgRn06JTjKD8SnVX58AB5B/t58zchpdevC1pKNiOdjXeJtKoaQLZwTK0najm9LfFpZ5pC0Xug39mEUiVBvPCLGGQMAy6Zpf9xI922UU+qL7Tu6nSom+UGsiRC9WWdtCsPJNIRqiAqmJ0= 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 1719232031882311.45157237741284; Mon, 24 Jun 2024 05:27:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.746542.1153622 (Exim 4.92) (envelope-from ) id 1sLimZ-00076q-1q; Mon, 24 Jun 2024 12:26:51 +0000 Received: by outflank-mailman (output) from mailman id 746542.1153622; Mon, 24 Jun 2024 12:26:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sLimY-00076j-Uz; Mon, 24 Jun 2024 12:26:50 +0000 Received: by outflank-mailman (input) for mailman id 746542; Mon, 24 Jun 2024 12:26:50 +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 1sLimY-00076d-7d for xen-devel@lists.xenproject.org; Mon, 24 Jun 2024 12:26:50 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 06a58c1d-3225-11ef-b4bb-af5377834399; Mon, 24 Jun 2024 14:26:48 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-362f62ae4c5so2450019f8f.1 for ; Mon, 24 Jun 2024 05:26:48 -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 d9443c01a7336-1f9eb3d43f6sm61430295ad.182.2024.06.24.05.26.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jun 2024 05:26:47 -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: 06a58c1d-3225-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719232007; x=1719836807; 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=BISiRXI8VY0evOcJTWm+6GCK6MEtQaD4JyxX2gs5bvE=; b=f9yyvnmBApXk9V3Ik3L6CzjXlLm3P+CVNfHslE65/qUkmbPAX7ofbuEUM2QoBtve7Y mNdW7jcB+mO+BBb1svFy5OoY3LCT3zSmuoP6AJ4spsX4OuObn7onAMCcojloqhNCFOJC ZIsWZ32FyzqRzDqZA0LMuC+00wkj9yTR/pfF5glGOtkVo2kNX8VGAeCRvYc4ZQ8PpN1z Wj38cYUftXY+FdAyJMLw0QYWsnonDOXP2JbvTz6oYaOudltFdX+iSn6rddy7akYuFGXg dH+dduTTi8zZLqM9+xKoiyh21zvWv+ys+/2oGOBB8gXyc2fW/UhUEo1xFrGb2veghbQG Uz3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719232007; x=1719836807; 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=BISiRXI8VY0evOcJTWm+6GCK6MEtQaD4JyxX2gs5bvE=; b=kAq6m7RYs9FT8xFUGnWwLN09WCFSb7rLZIKmAVY+UoQj4G4JEFBIayiSvpr0DHyyxo 17oSG/YehPBv11deJoT6dHSb8r2WXP4nM6xHbxmOY63Tpp2CmrkTmxdkG0yHdCJZIaLz G8FGC3++Sidf46Bfkn1TvyXHEQOvn8cdhkk4eEOr+ivnhb/EHMLVHQYs08OdQV/uVnJl A7/M63+M0ATVcx4dhH547atF96XNJC5N/lg1ZR4124pcl0iT+Fc4QqfmcfTMM2mAZGdG lNj0fqfFkMYnroLvU/474rdbC87EBvgCsxG5WCsJAcqb2lY9P69/1kQgWeaAKW08ydMU JFRw== X-Gm-Message-State: AOJu0Yzty2tstTBUg4ze15c1MY2OMPeqr/lAPVf0HP+scQt7j+YAvCtd KgkLsTt9iJ817qPxj3i7Rc5BxoosxVzcmbFyoIkSTlDdzKpn7fVbAIla3vjD21ZFcYiMezP7BRQ = X-Google-Smtp-Source: AGHT+IH4WPXDI4F+/OfjqRt/A2Ptuyfl1bT8g7viyJLsj3hJChWil4/ltAT2K+MmRrV/fK1LaY9UAQ== X-Received: by 2002:adf:f512:0:b0:366:deae:bfac with SMTP id ffacd0b85a97d-366e3269282mr4065130f8f.12.1719232007417; Mon, 24 Jun 2024 05:26:47 -0700 (PDT) Message-ID: <6fc55df2-5d92-4f3f-8eb3-69bd89bfea4e@suse.com> Date: Mon, 24 Jun 2024 14:26:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Oleksii Kurochko From: Jan Beulich Subject: [PATCH for-4.19] xen: re-add type checking to {,__}copy_from_guest_offset() 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: 1719232034049100001 Content-Type: text/plain; charset="utf-8" When re-working them to avoid UB on guest address calculations, I failed to add explicit type checks in exchange for the implicit ones that until then had happened in assignments that were there anyway. Fixes: 43d5c5d5f70b ("xen: avoid UB in guest handle arithmetic") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -86,6 +86,7 @@ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ =3D (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d =3D (ptr); \ + (void)((hnd).p =3D=3D _d); \ raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \ @@ -140,6 +141,7 @@ #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ unsigned long s_ =3D (unsigned long)(hnd).p; \ typeof(*(ptr)) *_d =3D (ptr); \ + (void)((hnd).p =3D=3D _d); \ __raw_copy_from_guest(_d, \ (const void *)(s_ + (off) * sizeof(*_d)), \ (nr) * sizeof(*_d)); \