SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-varlink: check correct errno

Browse Source 
'n' can also be assigned from recvmsg_safe(), which is our own
func returning negative errno.
This commit is contained in:
Mike Yuan
2024-09-04 18:50:54 +02:00
parent d6024cb3c1
commit 6f0d6ef7ce
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-varlink/sd-varlink.c
+15 -13
View File
@@ -870,23 +870,25 @@ static int varlink_read(sd_varlink *v) {
bool prefer_read = v->prefer_read;
if (!prefer_read) {
n = recv(v->input_fd, p, rs, MSG_DONTWAIT);
if (n < 0 && errno == ENOTSOCK)
if (n < 0)
n = -errno;
if (n == -ENOTSOCK)
prefer_read = v->prefer_read = true;
}
if (prefer_read)
if (prefer_read) {
n = read(v->input_fd, p, rs);
}
if (n < 0) {
if (errno == EAGAIN)
return 0;
if (ERRNO_IS_DISCONNECT(errno)) {
v->read_disconnected = true;
return 1;
if (n < 0)
n = -errno;
}
return -errno;
}
if (ERRNO_IS_NEG_TRANSIENT(n))
return 0;
if (ERRNO_IS_NEG_DISCONNECT(n)) {
v->read_disconnected = true;
return 1;
}
if (n < 0)
return n;
if (n == 0) { /* EOF */
if (v->allow_fd_passing_input)
@@ -897,7 +899,7 @@ static int varlink_read(sd_varlink *v) {
}
if (v->allow_fd_passing_input) {
struct cmsghdr* cmsg;
struct cmsghdr *cmsg;
cmsg = cmsg_find(&mh, SOL_SOCKET, SCM_RIGHTS, (socklen_t) -1);
if (cmsg) {