From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6667CC433B4 for ; Wed, 19 May 2021 15:48:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29D1A61184 for ; Wed, 19 May 2021 15:48:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29D1A61184 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 Technology.") Signed-off-by: Jan Beulich --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -323,12 +323,12 @@ static void tboot_gen_frametable_integri if ( nidx >= 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); *mac = vmac(NULL, 0, nonce, NULL, &ctx);