Message ID | 20230913115449.502183-2-stefanb@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | [PULL,v2,1/1] tpm: fix crash when FD >= 1024 and unnecessary errors due to EINTR | expand |
13.09.2023 14:54, Stefan Berger:
> Signed-off-by: Marc-Andr Lureau <marcandre.lureau@redhat.com>
It looks like this UTF8 glitch is within the commit itself, since
https://github.com/stefanberger/qemu-tpm/commit/07160c57e47ce38bd256af3eae0481543fb52626
is also displayed wrongly but the page itself is in UTF8.
/mjt
diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index a6e6d3e72f..1856589c3b 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -112,12 +112,8 @@ static int tpm_util_request(int fd, void *response, size_t responselen) { - fd_set readfds; + GPollFD fds[1] = { {.fd = fd, .events = G_IO_IN } }; int n; - struct timeval tv = { - .tv_sec = 1, - .tv_usec = 0, - }; n = write(fd, request, requestlen); if (n < 0) { @@ -127,11 +123,8 @@ static int tpm_util_request(int fd, return -EFAULT; } - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - /* wait for a second */ - n = select(fd + 1, &readfds, NULL, NULL, &tv); + n = RETRY_ON_EINTR(g_poll(fds, 1, 1000)); if (n != 1) { return -errno; }