[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 01/11] tpm: Use EMSGSIZE instead of EBADMSG to com
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v3 01/11] tpm: Use EMSGSIZE instead of EBADMSG to compile on OpenBSD |
Date: |
Fri, 13 Oct 2017 07:44:50 -0400 |
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>
Reviewed-by: Marc-André Lureau <address@hidden>
---
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 7b35429..4484207 100644
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -43,10 +43,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);
@@ -55,18 +55,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);
--
2.5.5
- [Qemu-devel] [PULL v3 00/11] Merge tpm 2017/10/04, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 01/11] tpm: Use EMSGSIZE instead of EBADMSG to compile on OpenBSD,
Stefan Berger <=
- [Qemu-devel] [PULL v3 08/11] tpm-passthrough: move reusable code to utils, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 02/11] tpm-backend: Remove unneeded member variable from backend class, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 04/11] tpm-backend: Initialize and free data members in it's own methods, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 07/11] tpm-backend: Move realloc_buffer() implementation to tpm-tis model, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 05/11] tpm-backend: Made few interface methods optional, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 06/11] tpm-backend: Add new API to read backend TpmInfo, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 09/11] tpm: Added support for TPM emulator, Stefan Berger, 2017/10/13
- [Qemu-devel] [PULL v3 03/11] tpm-backend: Move thread handling inside TPMBackend, Stefan Berger, 2017/10/13