Re: [Qemu-devel] [PATCH v3] tpm: Use EMSGSIZE instead of EBADMSG to compile on OpenBSD

[Stefan Berger]

On 10/11/2017 03:47 PM, Stefan Berger wrote:
> EBADMSG was only added to OpenBSD very recently. To make QEMU compilable
> on older OpenBSD versions use EMSGSIZE instead when a mismatch between
> number of received bytes and message size indicated in the header was
> found.
>
> Return -EMSGSIZE and convert all other errnos in the same functions to
> return the negative errno.
>
> Signed-off-by: Stefan Berger <address@hidden>

Can someone have a look at this, please?

   Stefan

> ---
>   hw/tpm/tpm_util.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
> index fb929f6..73d7796 100644
> --- a/hw/tpm/tpm_util.c
> +++ b/hw/tpm/tpm_util.c
> @@ -68,10 +68,10 @@ static int tpm_util_test(int fd,
>
>       n = write(fd, request, requestlen);
>       if (n < 0) {
> -        return errno;
> +        return -errno;
>       }
>       if (n != requestlen) {
> -        return EFAULT;
> +        return -EFAULT;
>       }
>
>       FD_ZERO(&readfds);
> @@ -80,18 +80,18 @@ static int tpm_util_test(int fd,
>       /* wait for a second */
>       n = select(fd + 1, &readfds, NULL, NULL, &tv);
>       if (n != 1) {
> -        return errno;
> +        return -errno;
>       }
>
>       n = read(fd, &buf, sizeof(buf));
>       if (n < sizeof(struct tpm_resp_hdr)) {
> -        return EFAULT;
> +        return -EFAULT;
>       }
>
>       resp = (struct tpm_resp_hdr *)buf;
>       /* check the header */
>       if (be32_to_cpu(resp->len) != n) {
> -        return EBADMSG;
> +        return -EMSGSIZE;
>       }
>
>       *return_tag = be16_to_cpu(resp->tag);