From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Lukasz Hawrylko" <lukasz.hawrylko@linux.intel.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH] x86/tboot: include all valid frame table entries in S3 integrity check
Date: Wed, 19 May 2021 17:48:33 +0200 [thread overview]
Message-ID: <e878fd86-2d82-ce3c-1dc4-d3a07025f1d4@suse.com> (raw)
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 <jbeulich@suse.com>
--- 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);
next reply other threads:[~2021-05-19 15:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 15:48 Jan Beulich [this message]
2021-05-28 7:00 ` Ping: [PATCH] x86/tboot: include all valid frame table entries in S3 integrity check Jan Beulich
2021-05-31 10:08 ` Lukasz Hawrylko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e878fd86-2d82-ce3c-1dc4-d3a07025f1d4@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=lukasz.hawrylko@linux.intel.com \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).