From nobody Fri May 3 13:29:20 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=1621439335; cv=none; d=zohomail.com; s=zohoarc; b=O1jzP/DX6EIYRgCnGw+uZfKO9kM1hD/otnEuhLkRNaLr6ncYIWxFXnurRtKK92ObO2u2MfiVM3QJvgDQyySKkyCiicZniZuvtMbuFjm34yXY57xIoP6+nAW4qJQ799BoBTx56qMHgUVnipdWEWzB35tizD8htPj+G+plU08leyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621439335; 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=9Wp1XDNH3tqp0mzl2nSP1h1Pe8UcGfBsHR7PAJ3dlQw=; b=bKVbeojjLVN5xHcextQhUgJx4KOE4y6/BmwAq8dWRLkKShM8qMcQPzTOczns5bFMDTtogmBkZtUEvvAaO5mSi312KsRzK/6dti5GgqI57jPGAbiXmQ8EFoRXH/c0k4oI57frcIknoBTMqBbc+r1M8SKvJyvhlbRqrHWO3Cg8ZyM= 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 1621439335275736.9041007158208; Wed, 19 May 2021 08:48:55 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.130211.244044 (Exim 4.92) (envelope-from ) id 1ljOR1-0001Eh-S6; Wed, 19 May 2021 15:48:35 +0000 Received: by outflank-mailman (output) from mailman id 130211.244044; Wed, 19 May 2021 15:48:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ljOR1-0001Ea-PA; Wed, 19 May 2021 15:48:35 +0000 Received: by outflank-mailman (input) for mailman id 130211; Wed, 19 May 2021 15:48:34 +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 1ljOR0-0001EE-GF for xen-devel@lists.xenproject.org; Wed, 19 May 2021 15:48:34 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 04dff2c3-9e11-4aea-9a04-23a82a85d2bb; Wed, 19 May 2021 15:48:33 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 817D6AEF8; Wed, 19 May 2021 15:48:32 +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: 04dff2c3-9e11-4aea-9a04-23a82a85d2bb 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=1621439312; 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=9Wp1XDNH3tqp0mzl2nSP1h1Pe8UcGfBsHR7PAJ3dlQw=; b=bTvX/CXb1Ey/bPwWbAexDHxyJ4RYbqcOurLagfxT4FovkK1kArJWsscooIpgj0tPhxQDbm GjVEdW5Fal2SDMInBLiqBLCyO15U9ovU5Hmc0LleNlR3EMNYH4+sryW23/pHF/uB/lDvke aEgx9k5UiJwgSj08aHwoQe1QY93xJqM= 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: include all valid frame table entries in S3 integrity check Message-ID: Date: Wed, 19 May 2021 17:48:33 +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" The difference of two pdx_to_page() return values is a number of pages, not the number of bytes covered by the corresponding frame table entries. Fixes: 3cb68d2b59ab ("tboot: fix S3 issue for Intel Trusted Execution Techn= ology.") Signed-off-by: Jan Beulich Reviewed-by: Lukasz Hawrylko --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -323,12 +323,12 @@ static void tboot_gen_frametable_integri if ( nidx >=3D max_idx ) break; vmac_update((uint8_t *)pdx_to_page(sidx * PDX_GROUP_COUNT), - pdx_to_page(eidx * PDX_GROUP_COUNT) - - pdx_to_page(sidx * PDX_GROUP_COUNT), &ctx); + (eidx - sidx) * PDX_GROUP_COUNT * sizeof(*frame_table), + &ctx); } vmac_update((uint8_t *)pdx_to_page(sidx * PDX_GROUP_COUNT), - pdx_to_page(max_pdx - 1) + 1 - - pdx_to_page(sidx * PDX_GROUP_COUNT), &ctx); + (max_pdx - sidx * PDX_GROUP_COUNT) * sizeof(*frame_table), + &ctx); =20 *mac =3D vmac(NULL, 0, nonce, NULL, &ctx); =20