diff options
author | Chia-chi Yeh <chiachi@android.com> | 2009-06-19 07:15:05 +0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-02-14 11:26:32 -0800 |
commit | b64107245dbade3bd0a341fb7bd1b9cd4698ff6d (patch) | |
tree | 364dc2e1544417f9502ce29717631ca1c2b05111 /security | |
parent | e7a8aa97bb9f4439e63948800883d8d874c78c95 (diff) |
security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/commoncap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 7ce191ea29a..5bfc35b9b56 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -29,6 +29,10 @@ #include <linux/securebits.h> #include <linux/user_namespace.h> +#ifdef CONFIG_ANDROID_PARANOID_NETWORK +#include <linux/android_aid.h> +#endif + /* * If a non-root user executes a setuid-root binary in * !secure(SECURE_NOROOT) mode, then we raise capabilities. @@ -74,6 +78,11 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb) int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) { + if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW)) + return 0; + if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN)) + return 0; + for (;;) { /* The creator of the user namespace has all caps. */ if (targ_ns != &init_user_ns && targ_ns->creator == cred->user) |