Merge pull request #15504 from poettering/cmsg-find-pure

just the recvmsg_safe() stuff from #15457
2020-04-23 17:28:19 +02:00
parent a9ab5cdb50 3691bcf3c5
commit 0f4a141744
16 changed files with 129 additions and 91 deletions
@@ -925,12 +925,11 @@ int ask_password_agent(
                msghdr.msg_control = &control;
                msghdr.msg_controllen = sizeof(control);

-                n = recvmsg(socket_fd, &msghdr, 0);
+                n = recvmsg_safe(socket_fd, &msghdr, 0);
+                if (IN_SET(n, -EAGAIN, -EINTR))
+                        continue;
                if (n < 0) {
-                        if (IN_SET(errno, EAGAIN, EINTR))
-                                continue;
-
-                        r = -errno;
+                        r = (int) n;
                        goto finish;
                }