summaryrefslogtreecommitdiff
path: root/pfinet/io-ops.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-01-05 01:32:49 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-01-05 01:32:49 +0100
commit05a15f8c43e7a167983f19bd866b90158661703e (patch)
treea71d747f75f2155f49eb04e32ef0066b0a89dd4c /pfinet/io-ops.c
parent89c9590e020e1372cfab037b7789aaef89b4f544 (diff)
lwip,pfinet: Fix crash on make_sock_user getting EINTR
_ports_create_port_internal may return EINTR. * lwip/port-objs.c (make_sock_user): Set errno when ports_create_port returns an error. * pfinet/socket.c (make_sock_user): Likewise. * lwip/io-ops.c (lwip_S_io_reauthenticate): Loop while make_sock_user errors with EINTR. * pfinet/io-ops.c (S_io_reauthenticate): Likewise.
Diffstat (limited to 'pfinet/io-ops.c')
-rw-r--r--pfinet/io-ops.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
index e0e1875b..c1b6e5b5 100644
--- a/pfinet/io-ops.c
+++ b/pfinet/io-ops.c
@@ -374,7 +374,14 @@ S_io_reauthenticate (struct sock_user *user,
aux_gids = agbuf;
pthread_mutex_lock (&global_lock);
- newuser = make_sock_user (user->sock, 0, 1, 0);
+ do
+ newuser = make_sock_user (user->sock, 0, 1, 0);
+ while (!newuser && errno == EINTR);
+ if (!newuser)
+ {
+ pthread_mutex_unlock (&global_lock);
+ return 0;
+ }
auth = getauth ();
newright = ports_get_send_right (newuser);