From e7705e2191a7c3ee8426b0a5e0b9432f1781f759 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 8 Apr 2024 11:07:10 +0200 Subject: [PATCH] nsresourced: don't redefine of bpf_rdonly_cast bpf_rdonly_cast() was introduced in libbpf commit 688879f together with the definition of a bpf_core_cast macro. So use that one to avoid defining a prototype for bpf_rdonly_cast; --- src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c b/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c index c9a936ba13c..126422bb69c 100644 --- a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c +++ b/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c @@ -20,7 +20,12 @@ #include #include +#ifndef bpf_core_cast +/* bpf_rdonly_cast() was introduced in libbpf commit 688879f together with + * the definition of a bpf_core_cast macro. So use that one to avoid + * defining a prototype for bpf_rdonly_cast */ void *bpf_rdonly_cast(void *, __u32) __ksym; +#endif /* BPF module that implements an allowlist of mounts (identified by mount ID) for user namespaces (identified * by their inode number in nsfs) that restricts creation of inodes (which would inherit the callers UID/GID) -- 2.47.3