On Mon, Mar 10, 2025 at 03:48:16PM +0800, Gary Lin via Grub-devel wrote:
> On Thu, Mar 06, 2025 at 08:46:52PM +0100, Yann Diorcet wrote:
> > When tpm2_submit_command_real is called for a retry, the content of
> > out buffer can already be set with previous grub_tcg2_submit_command
> > call's reply. Restore previous offset allowing the next
> > tpm2_submit_command_real calls to succeed.
> >
> > This solves the issues occurring during TPM_CC_Load command on the
> > integrated
> > TPM 2.0 in Intel Elkhart Lake chip.
> >
> Thanks for catching this issue!
>
> > Signed-off-by: Diorcet Yann <[email protected]>
Sadly this patch does not apply to upstream...
> > ---
> > grub-core/lib/tss2/tpm2_cmd.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/grub-core/lib/tss2/tpm2_cmd.c b/grub-core/lib/tss2/tpm2_cmd.c
> > index 6d25db1ab..6be6c8fc5 100644
> > --- a/grub-core/lib/tss2/tpm2_cmd.c
> > +++ b/grub-core/lib/tss2/tpm2_cmd.c
> > @@ -85,6 +85,7 @@ tpm2_submit_command (const TPMI_ST_COMMAND_TAG_t tag,
> > struct grub_tpm2_buffer *out)
> > {
> > TPM_RC_t err;
> > + grub_size_t offset = out->offset;
> > int retry_cnt = 0;
> >
> > /* Catch TPM_RC_RETRY and send the command again */
> Since we always need a clean output buffer, maybe we can call
> 'grub_tpm2_buffer_init(out)' right before 'tpm2_submit_command_real()'
> to make sure the output buffer is always initialized. Besides, with this
> change, we can remove all 'grub_tpm2_buffer_init (&out)' in the TPM2
> command functions.
It would be nice if Gary's comment is taken into account too.
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
