shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00
Code

varlink: make errors returned by verify_unix_socket() systematic

Browse Source 
Previously, if we encountered a non-socket fd we'd return ENOTSOCK the
first time, but the subsequent times we'd return ENOMEDIUM, due to
caching. Let's make sure we return the same errors all the the time.
This commit is contained in:
Lennart Poettering 2024-04-25 17:23:24 +02:00 committed by Luca Boccassi
parent 536b5c0748
commit b24c384b5d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/varlink.c
View File

@ -3170,6 +3170,16 @@ int varlink_take_fd(Varlink *v, size_t i) {
static int verify_unix_socket(Varlink *v) {
assert(v);
/* Returns:
* • 0 if this is an AF_UNIX socket
* • -ENOTSOCK if this is not a socket at all
* • -ENOMEDIUM if this is a socket, but not an AF_UNIX socket
*
* Reminder:
* • v->af is < 0 if we haven't checked what kind of address family the thing is yet.
* • v->af == AF_UNSPEC if we checked but it's not a socket
* • otherwise: v->af contains the address family we determined */
if (v->af < 0) {
struct stat st;
@ -3185,7 +3195,8 @@ static int verify_unix_socket(Varlink *v) {
return v->af;
}
return v->af == AF_UNIX ? 0 : -ENOMEDIUM;
return v->af == AF_UNIX ? 0 :
v->af == AF_UNSPEC ? -ENOTSOCK : -ENOMEDIUM;
}
int varlink_set_allow_fd_passing_input(Varlink *v, bool b) {