d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cat: persistent errno

Browse Source 
There is no guarantee that after close(2)/free the errno will remain
persistent. The caller of the udom_open function depends on the errno
for reporting errors.

Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D28185
This commit is contained in:
Mariusz Zaborski 2021-01-16 12:55:42 +01:00
parent 8ca9ff4f28
commit 6e8062c855
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/cat/cat.c
View File

@ -429,7 +429,7 @@ udom_open(const char *path, int flags)
struct addrinfo hints, *res, *res0;
char rpath[PATH_MAX];
int fd = -1;
int error;
int error, serrno;
cap_rights_t rights;
/*
@ -453,18 +453,23 @@ udom_open(const char *path, int flags)
fd = socket(res->ai_family, res->ai_socktype,
res->ai_protocol);
if (fd < 0) {
serrno = errno;
freeaddrinfo(res0);
errno = serrno;
return (-1);
}
if (caph_rights_limit(fd, &rights) < 0) {
serrno = errno;
close(fd);
freeaddrinfo(res0);
errno = serrno;
return (-1);
}
error = cap_connect(capnet, fd, res->ai_addr, res->ai_addrlen);
if (error == 0)
break;
else {
serrno = errno;
close(fd);
fd = -1;
}
@ -492,9 +497,13 @@ udom_open(const char *path, int flags)
cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN);
if (caph_rights_limit(fd, &rights) < 0) {
serrno = errno;
close(fd);
errno = serrno;
return (-1);
}
} else {
errno = serrno;
}
return (fd);
}