| Message ID | 20240315113828.258005-9-cgzones@googlemail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | [01/10] capability: introduce new capable flag CAP_OPT_NOAUDIT_ONDENY | expand |
On Fri, Mar 15, 2024 at 4:39 AM Christian Göttsche <cgzones@googlemail.com> wrote: > > Use the new added capable_any function in bpf_token_capable() and > bpf_net_capable() implementations. > > Signed-off-by: Christian Göttsche <cgzones@googlemail.com> > --- > v5: > add patch > --- > include/linux/bpf.h | 2 +- > kernel/bpf/syscall.c | 2 +- > kernel/bpf/token.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > It's actually a nice readability improvement, thanks! Acked-by: Andrii Nakryiko <andrii@kernel.org> > diff --git a/include/linux/bpf.h b/include/linux/bpf.h > index 4f20f62f9d63..bdadf3291bec 100644 > --- a/include/linux/bpf.h > +++ b/include/linux/bpf.h > @@ -2701,7 +2701,7 @@ static inline int bpf_obj_get_user(const char __user *pathname, int flags) > > static inline bool bpf_token_capable(const struct bpf_token *token, int cap) > { > - return capable(cap) || (cap != CAP_SYS_ADMIN && capable(CAP_SYS_ADMIN)); > + return capable_any(cap, CAP_SYS_ADMIN); > } > > static inline void bpf_token_inc(struct bpf_token *token) > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index ae2ff73bde7e..a10e6f77002c 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c > @@ -1175,7 +1175,7 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token, > > static bool bpf_net_capable(void) > { > - return capable(CAP_NET_ADMIN) || capable(CAP_SYS_ADMIN); > + return capable_any(CAP_NET_ADMIN, CAP_SYS_ADMIN); > } > > #define BPF_MAP_CREATE_LAST_FIELD map_token_fd > diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c > index d6ccf8d00eab..53f491046a8d 100644 > --- a/kernel/bpf/token.c > +++ b/kernel/bpf/token.c > @@ -11,7 +11,7 @@ > > static bool bpf_ns_capable(struct user_namespace *ns, int cap) > { > - return ns_capable(ns, cap) || (cap != CAP_SYS_ADMIN && ns_capable(ns, CAP_SYS_ADMIN)); > + return ns_capable_any(ns, cap, CAP_SYS_ADMIN); > } > > bool bpf_token_capable(const struct bpf_token *token, int cap) > -- > 2.43.0 >
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 4f20f62f9d63..bdadf3291bec 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2701,7 +2701,7 @@ static inline int bpf_obj_get_user(const char __user *pathname, int flags) static inline bool bpf_token_capable(const struct bpf_token *token, int cap) { - return capable(cap) || (cap != CAP_SYS_ADMIN && capable(CAP_SYS_ADMIN)); + return capable_any(cap, CAP_SYS_ADMIN); } static inline void bpf_token_inc(struct bpf_token *token) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index ae2ff73bde7e..a10e6f77002c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1175,7 +1175,7 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token, static bool bpf_net_capable(void) { - return capable(CAP_NET_ADMIN) || capable(CAP_SYS_ADMIN); + return capable_any(CAP_NET_ADMIN, CAP_SYS_ADMIN); } #define BPF_MAP_CREATE_LAST_FIELD map_token_fd diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c index d6ccf8d00eab..53f491046a8d 100644 --- a/kernel/bpf/token.c +++ b/kernel/bpf/token.c @@ -11,7 +11,7 @@ static bool bpf_ns_capable(struct user_namespace *ns, int cap) { - return ns_capable(ns, cap) || (cap != CAP_SYS_ADMIN && ns_capable(ns, CAP_SYS_ADMIN)); + return ns_capable_any(ns, cap, CAP_SYS_ADMIN); } bool bpf_token_capable(const struct bpf_token *token, int cap)
Use the new added capable_any function in bpf_token_capable() and bpf_net_capable() implementations. Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- v5: add patch --- include/linux/bpf.h | 2 +- kernel/bpf/syscall.c | 2 +- kernel/bpf/token.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)