From nobody Sat May 4 23:45: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=1621439399; cv=none; d=zohomail.com; s=zohoarc; b=GoLLZ0m0nDJwuEFe39ftJKjENtElR1P4zBQT6UiB0Qln5GEK0aWlZadRTSjgV4LE57D3dre0c0f+o0EeixdDyWna/sb5WUzG4hZ5tq3qlWMG1Wso350jf9Myei8U08VeHybFpreCHltMLCcb32Si2CRlgwmZcAAlTSPctcNgU6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621439399; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=81zFPIuhUnEJqIsltZDYP1MSh2QxuDgB2YkRgK/qc6s=; b=FlfNrhIRFLmi3NZr3smV1HxfJJYLyi+EBzwEgD9MqPXXDo2s2cMxRtRQBxeLRTQDP+uZwx7xS78zsdIly0BqJkq6TbGPadgp1aUmfKhjTQLQ1Dz2S0yS8xdlDKIGR8wmqOyGGmPeXfRhxpN6qn+QtSGYBloMYNcrsS6pOnmQGLA= 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) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1621439399303559.7094602138943; Wed, 19 May 2021 08:49:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.130217.244054 (Exim 4.92) (envelope-from ) id 1ljOS9-0001qs-6q; Wed, 19 May 2021 15:49:45 +0000 Received: by outflank-mailman (output) from mailman id 130217.244054; Wed, 19 May 2021 15:49: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 1ljOS9-0001ql-3m; Wed, 19 May 2021 15:49:45 +0000 Received: by outflank-mailman (input) for mailman id 130217; Wed, 19 May 2021 15:49:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ljOS7-0001qY-9w for xen-devel@lists.xenproject.org; Wed, 19 May 2021 15:49:43 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d0d02537-fffe-4c21-8b53-a65bf72ca2ff; Wed, 19 May 2021 15:49:42 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 76C3FABB1; Wed, 19 May 2021 15:49:41 +0000 (UTC) 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: d0d02537-fffe-4c21-8b53-a65bf72ca2ff X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1621439381; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81zFPIuhUnEJqIsltZDYP1MSh2QxuDgB2YkRgK/qc6s=; b=b9yEdtU65m4bFJl0T0djMMSByCq+XrdYdzFRffdM6xo5QVCAZ/HP6WY/+sRK8nFHlJVlMx BwcRJV8IX8BFQld17X+41lwpMS/Bnb2P97FmMEb/fdtrSbWmTh90s9v3faLQzy0IhOREoG d6Brn74wXNg7nuroVS/FaHYv+QFCJDA= To: "xen-devel@lists.xenproject.org" Cc: Lukasz Hawrylko , Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= From: Jan Beulich Subject: [PATCH] x86/tboot: adjust UUID check Message-ID: <422e39c9-0cba-0944-b813-dfe2578ad719@suse.com> Date: Wed, 19 May 2021 17:49:42 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Replace a bogus cast, move the static variable into the only function using it, and add __initconst. While there, also remove a pointless NULL check. Signed-off-by: Jan Beulich Reviewed-by: Lukasz Hawrylko --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -27,8 +27,6 @@ static vmac_t domain_mac; /* MAC for static vmac_t xenheap_mac; /* MAC for xen heap during S3 */ static vmac_t frametable_mac; /* MAC for frame table during S3 */ =20 -static const uuid_t tboot_shared_uuid =3D TBOOT_SHARED_UUID; - /* used by tboot_protect_mem_regions() and/or tboot_parse_dmar_table() */ static uint64_t __initdata txt_heap_base, __initdata txt_heap_size; static uint64_t __initdata sinit_base, __initdata sinit_size; @@ -93,6 +91,7 @@ static void __init tboot_copy_memory(uns void __init tboot_probe(void) { tboot_shared_t *tboot_shared; + static const uuid_t __initconst tboot_shared_uuid =3D TBOOT_SHARED_UUI= D; =20 /* Look for valid page-aligned address for shared page. */ if ( !opt_tboot_pa || (opt_tboot_pa & ~PAGE_MASK) ) @@ -101,9 +100,7 @@ void __init tboot_probe(void) /* Map and check for tboot UUID. */ set_fixmap(FIX_TBOOT_SHARED_BASE, opt_tboot_pa); tboot_shared =3D fix_to_virt(FIX_TBOOT_SHARED_BASE); - if ( tboot_shared =3D=3D NULL ) - return; - if ( memcmp(&tboot_shared_uuid, (uuid_t *)tboot_shared, sizeof(uuid_t)= ) ) + if ( memcmp(&tboot_shared_uuid, &tboot_shared->uuid, sizeof(uuid_t)) ) return; =20 /* new tboot_shared (w/ GAS support, integrity, etc.) is not backwards