From 33b9337130cf2b1b867656eac85e7fe378ac0c13 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Feb 2024 16:37:27 +0100 Subject: [PATCH] =?UTF-8?q?cgroup:=20typo=20fix=20initial=5Frestric=5Fifac?= =?UTF-8?q?es=5Flink=5Ffds=20=E2=86=92=20initial=5Frestrict=5Fifaces=5Flin?= =?UTF-8?q?k=5Ffds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/bpf-restrict-ifaces.c | 10 +++++----- src/core/cgroup.c | 2 +- src/core/cgroup.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/bpf-restrict-ifaces.c b/src/core/bpf-restrict-ifaces.c index 1156e6af79e..ddecd3f8666 100644 --- a/src/core/bpf-restrict-ifaces.c +++ b/src/core/bpf-restrict-ifaces.c @@ -159,7 +159,7 @@ int bpf_restrict_ifaces_install(Unit *u) { return 0; r = restrict_ifaces_install_impl(u); - fdset_close(crt->initial_restric_ifaces_link_fds); + fdset_close(crt->initial_restrict_ifaces_link_fds); return r; } @@ -189,13 +189,13 @@ int bpf_restrict_ifaces_add_initial_link_fd(Unit *u, int fd) { if (!crt) return -EINVAL; - if (!crt->initial_restric_ifaces_link_fds) { - crt->initial_restric_ifaces_link_fds = fdset_new(); - if (!crt->initial_restric_ifaces_link_fds) + if (!crt->initial_restrict_ifaces_link_fds) { + crt->initial_restrict_ifaces_link_fds = fdset_new(); + if (!crt->initial_restrict_ifaces_link_fds) return log_oom(); } - r = fdset_put(crt->initial_restric_ifaces_link_fds, fd); + r = fdset_put(crt->initial_restrict_ifaces_link_fds, fd); if (r < 0) return log_unit_error_errno(u, r, "restrict-interfaces: Failed to put restrict-ifaces-bpf-fd %d to restored fdset: %m", fd); diff --git a/src/core/cgroup.c b/src/core/cgroup.c index a32b43059eb..9567d56d0f0 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -5249,7 +5249,7 @@ CGroupRuntime *cgroup_runtime_free(CGroupRuntime *crt) { bpf_link_free(crt->restrict_ifaces_ingress_bpf_link); bpf_link_free(crt->restrict_ifaces_egress_bpf_link); #endif - fdset_free(crt->initial_restric_ifaces_link_fds); + fdset_free(crt->initial_restrict_ifaces_link_fds); safe_close(crt->ipv4_allow_map_fd); safe_close(crt->ipv6_allow_map_fd); diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 54fb96981e1..ad34f779587 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -358,7 +358,7 @@ typedef struct CGroupRuntime { struct bpf_link *ipv6_socket_bind_link; #endif - FDSet *initial_restric_ifaces_link_fds; + FDSet *initial_restrict_ifaces_link_fds; #if BPF_FRAMEWORK struct bpf_link *restrict_ifaces_ingress_bpf_link; struct bpf_link *restrict_ifaces_egress_bpf_link;