From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Cc: Serge Hallyn <serge@hallyn.com>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/8] capability: use new capable_any functionality
Date: Wed, 15 Jun 2022 17:26:16 +0200 [thread overview]
Message-ID: <20220615152623.311223-1-cgzones@googlemail.com> (raw)
In-Reply-To: <20220502160030.131168-8-cgzones@googlemail.com>
Use the new added capable_any function in appropriate cases, where a
task is required to have any of two capabilities.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
v3:
- rename to capable_any()
- simplify checkpoint_restore_ns_capable()
---
include/linux/capability.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 7316d5339a6e..092cb9773079 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -266,18 +266,17 @@ extern bool file_ns_capable(const struct file *file, struct user_namespace *ns,
extern bool ptracer_capable(struct task_struct *tsk, struct user_namespace *ns);
static inline bool perfmon_capable(void)
{
- return capable(CAP_PERFMON) || capable(CAP_SYS_ADMIN);
+ return capable_any(CAP_PERFMON, CAP_SYS_ADMIN);
}
static inline bool bpf_capable(void)
{
- return capable(CAP_BPF) || capable(CAP_SYS_ADMIN);
+ return capable_any(CAP_BPF, CAP_SYS_ADMIN);
}
static inline bool checkpoint_restore_ns_capable(struct user_namespace *ns)
{
- return ns_capable(ns, CAP_CHECKPOINT_RESTORE) ||
- ns_capable(ns, CAP_SYS_ADMIN);
+ return ns_capable_any(ns, CAP_CHECKPOINT_RESTORE, CAP_SYS_ADMIN);
}
/* audit system wants to get cap info from files as well */
--
2.36.1
next prev parent reply other threads:[~2022-06-15 15:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 14:49 [RFC PATCH 2/2] capability: use new capable_or functionality Christian Göttsche
2022-02-17 14:49 ` [RFC PATCH 1/2] capability: add capable_or to test for multiple caps with exactly one audit message Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 2/8] capability: use new capable_or functionality Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 3/8] block: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 4/8] drivers: " Christian Göttsche
2022-05-09 10:44 ` Jiri Slaby
2022-05-09 10:46 ` Hans Verkuil
2022-05-02 16:00 ` [PATCH v2 5/8] fs: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 6/8] kernel: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 7/8] kernel/bpf: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche
2022-05-09 17:15 ` Serge E. Hallyn
2022-05-22 17:33 ` Serge E. Hallyn
2022-05-02 16:00 ` [PATCH v2 1/8] capability: add capable_or to test for multiple caps with exactly one audit message Christian Göttsche
2022-05-09 17:12 ` Serge E. Hallyn
2022-06-15 15:26 ` Christian Göttsche [this message]
2022-06-15 15:26 ` [PATCH v3 3/8] block: use new capable_any functionality Christian Göttsche
2022-06-16 3:00 ` Bart Van Assche
2022-06-15 15:26 ` [PATCH v3 4/8] drivers: " Christian Göttsche
2022-06-15 15:45 ` Laurent Pinchart
2022-06-15 15:26 ` [PATCH v3 5/8] fs: " Christian Göttsche
2022-06-28 12:56 ` Christian Brauner
2022-06-28 14:11 ` Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 6/8] kernel: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 7/8] bpf: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 8/8] net: " Christian Göttsche
2022-06-15 15:26 ` [PATCH v3 1/8] capability: add any wrapper to test for multiple caps with exactly one audit message Christian Göttsche
2022-06-26 22:34 ` Serge E. Hallyn
2022-08-30 15:05 ` Christian Göttsche
2022-08-30 15:10 ` Paul Moore
2022-09-02 0:56 ` Paul Moore
2022-09-02 1:35 ` Paul Moore
2022-02-17 17:29 ` [RFC PATCH 2/2] capability: use new capable_or functionality Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220615152623.311223-1-cgzones@googlemail.com \
--to=cgzones@googlemail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=selinux@vger.kernel.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).