mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qrap: Don't rely on errno after perror(), and reset it before usage

Browse source 
In commit fca5e11773 ("qrap: Add probe retry on connection reset
from passt for KubeVirt integration") I just used errno to check if
the connection was reset on recv(), but perror() might set it to
EINVAL if e.g. an underlying logging mechanism fails, so we won't
actually catch the connection reset.

And in case recv() returns 0, errno won't be set, but we're still
using it without resetting it first, which leads to unpredictable
results in that case.

Reset errno before probing with connect(), send() and recv(), and
save it for later checks before calling perror().

Fixes: fca5e11773 ("qrap: Add probe retry on connection reset from passt for KubeVirt integration")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-07-06 08:02:24 +02:00
parent cbac0245c8
commit 27aec5911a
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
qrap.c
View file

@ -112,8 +112,8 @@ void usage(const char *name)
*/ */
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset, err;
struct timeval tv = { .tv_sec = 0, .tv_usec = (long)(500 * 1000) }; struct timeval tv = { .tv_sec = 0, .tv_usec = (long)(500 * 1000) };
int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset;
char *qemu_argv[ARG_MAX], dev_str[ARG_MAX]; char *qemu_argv[ARG_MAX], dev_str[ARG_MAX];
struct sockaddr_un addr = { struct sockaddr_un addr = {
.sun_family = AF_UNIX, .sun_family = AF_UNIX,
@ -249,14 +249,21 @@ retry:
perror("setsockopt SO_SNDTIMEO"); perror("setsockopt SO_SNDTIMEO");
snprintf(addr.sun_path, UNIX_PATH_MAX, UNIX_SOCK_PATH, i); snprintf(addr.sun_path, UNIX_PATH_MAX, UNIX_SOCK_PATH, i);
if (connect(s, (const struct sockaddr *)&addr, sizeof(addr)))
errno = 0;
if (connect(s, (const struct sockaddr *)&addr, sizeof(addr))) {
err = errno;
perror("connect"); perror("connect");
else if (send(s, &probe, sizeof(probe), 0) != sizeof(probe)) } else if (send(s, &probe, sizeof(probe), 0) != sizeof(probe)) {
err = errno;
perror("send"); perror("send");
else if (recv(s, &probe_r, 1, MSG_PEEK) <= 0) } else if (recv(s, &probe_r, 1, MSG_PEEK) <= 0) {
err = errno;
perror("recv"); perror("recv");
else } else {
break; break;
}
/* FIXME: in a KubeVirt environment, libvirtd invokes qrap three /* FIXME: in a KubeVirt environment, libvirtd invokes qrap three
* times in a strict sequence when a virtual machine needs to * times in a strict sequence when a virtual machine needs to
@ -280,7 +287,7 @@ retry:
* this FIXME will probably remain until the tool itself is * this FIXME will probably remain until the tool itself is
* obsoleted. * obsoleted.
*/ */
if (retry_on_reset && errno == ECONNRESET) { if (retry_on_reset && err == ECONNRESET) {
retry_on_reset--; retry_on_reset--;
usleep(50 * 1000); usleep(50 * 1000);
goto retry; goto retry;