diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 13:07:42 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 15:00:57 +0100 |
| commit | 254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch) | |
| tree | 067102a36abe6bf597c26a42d79018a1060c9007 /src/core/bpf-firewall.c | |
| parent | cbff793ffb280d9d11e5d7b1dc3964276491bee8 (diff) | |
| download | systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.gz | |
tree-wide: use -EBADF for fd initialization
-1 was used everywhere, but -EBADF or -EBADFD started being used in various
places. Let's make things consistent in the new style.
Note that there are two candidates:
EBADF 9 Bad file descriptor
EBADFD 77 File descriptor in bad state
Since we're initializating the fd, we're just assigning a value that means
"no fd yet", so it's just a bad file descriptor, and the first errno fits
better. If instead we had a valid file descriptor that became invalid because
of some operation or state change, the other errno would fit better.
In some places, initialization is dropped if unnecessary.
Diffstat (limited to 'src/core/bpf-firewall.c')
| -rw-r--r-- | src/core/bpf-firewall.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c index ce3b76c512..5878a81879 100644 --- a/src/core/bpf-firewall.c +++ b/src/core/bpf-firewall.c @@ -411,7 +411,7 @@ static int bpf_firewall_prepare_access_maps( int *ret_ipv6_map_fd, bool *ret_has_any) { - _cleanup_close_ int ipv4_map_fd = -1, ipv6_map_fd = -1; + _cleanup_close_ int ipv4_map_fd = -EBADF, ipv6_map_fd = -EBADF; size_t n_ipv4 = 0, n_ipv6 = 0; Unit *p; int r; @@ -874,8 +874,8 @@ int bpf_firewall_supported(void) { // Ideally it should behave like GCC, so that we can remove these workarounds. zero(attr); attr.attach_type = BPF_CGROUP_INET_EGRESS; - attr.target_fd = -1; - attr.attach_bpf_fd = -1; + attr.target_fd = -EBADF; + attr.attach_bpf_fd = -EBADF; if (bpf(BPF_PROG_DETACH, &attr, sizeof(attr)) < 0) { if (errno != EBADF) { @@ -902,8 +902,8 @@ int bpf_firewall_supported(void) { zero(attr); attr.attach_type = BPF_CGROUP_INET_EGRESS; - attr.target_fd = -1; - attr.attach_bpf_fd = -1; + attr.target_fd = -EBADF; + attr.attach_bpf_fd = -EBADF; attr.attach_flags = BPF_F_ALLOW_MULTI; if (bpf(BPF_PROG_ATTACH, &attr, sizeof(attr)) < 0) { |