From: Stefan Berger <stefanb@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, marcandre.lureau@gmail.com
Subject: Re: [PATCH 2/2] tpm_emulator: Read control channel response in 2 passes
Date: Mon, 14 Oct 2024 09:27:03 -0400 [thread overview]
Message-ID: <f88c3517-5405-448e-8bfe-c77416ea7cb8@linux.ibm.com> (raw)
In-Reply-To: <20241011223556.2953808-3-stefanb@linux.ibm.com>
On 10/11/24 6:35 PM, Stefan Berger wrote:
> Error responses from swtpm are always only 4 bytes long. Therefore, read
> the entire response in 2 passes and stop if the first 4 bytes indicate an
> error response with no subsequent bytes readable. Read the rest in a 2nd
> pass, if needed. This avoids getting stuck while waiting for too many bytes
> if only 4 bytes were sent due to an error message. The 'getting stuck'
> condition has not been observed in practice so far, though.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2615
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> backends/tpm/tpm_emulator.c | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
> index b0e2fb3fc7..1b2e890668 100644
> --- a/backends/tpm/tpm_emulator.c
> +++ b/backends/tpm/tpm_emulator.c
> @@ -129,6 +129,9 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg,
> uint32_t cmd_no = cpu_to_be32(cmd);
> ssize_t n = sizeof(uint32_t) + msg_len_in;
> uint8_t *buf = NULL;
> + ptm_res res;
> + off_t o = 0;
> + int to_read;
>
> WITH_QEMU_LOCK_GUARD(&tpm->mutex) {
> buf = g_alloca(n);
> @@ -140,11 +143,29 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg,
> return -1;
> }
>
> - if (msg_len_out != 0) {
> - n = qemu_chr_fe_read_all(dev, msg, msg_len_out);
> + /*
> + * Any response will be at least 4 bytes long. Error responses are only
> + * 4 bytes (=sizeof(ptm_res)), though. Therefore, read response in 2
> + * passes, returning when an error response is encountered.
> + */
v2: We need one exception here and that's CMD_GET_STATEBLOB since it has
been sending a longer header since basically 'forever'.
> + to_read = sizeof(res);
> + while (msg_len_out > 0) {
> + n = qemu_chr_fe_read_all(dev, (uint8_t *)msg + o, to_read);
> if (n <= 0) {
> return -1;
> }
> + msg_len_out -= to_read;
> + if (msg_len_out == 0) {
> + return 0;
> + }
> +
> + memcpy(&res, msg, sizeof(res));
> + if (res) {
> + return 0;
> + }
> +
> + o = to_read;
> + to_read = msg_len_out;
> }
> }
>
prev parent reply other threads:[~2024-10-14 13:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-11 22:35 [PATCH 0/2] tpm: Resolve potential blocking forever issue Stefan Berger
2024-10-11 22:35 ` [PATCH 1/2] tpm: Use new ptm_cap_n structure for PTM_GET_CAPABILITY Stefan Berger
2024-10-11 22:35 ` [PATCH 2/2] tpm_emulator: Read control channel response in 2 passes Stefan Berger
2024-10-14 13:27 ` Stefan Berger [this message]
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=f88c3517-5405-448e-8bfe-c77416ea7cb8@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=berrange@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=qemu-devel@nongnu.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).