diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2009-06-19 07:15:05 +0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:14 -0700 |
| commit | 622495a5adf75911922749bb10ba7b1b8c6b8639 (patch) | |
| tree | 25f1814a20e391b820417e3674f5cb75c6ba7f24 /security | |
| parent | 764fc0ee29cc7e19167c2a73ebd6548a9ffbc88f (diff) | |
| download | kernel_samsung_aries-622495a5adf75911922749bb10ba7b1b8c6b8639.zip kernel_samsung_aries-622495a5adf75911922749bb10ba7b1b8c6b8639.tar.gz kernel_samsung_aries-622495a5adf75911922749bb10ba7b1b8c6b8639.tar.bz2 | |
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 a93b3b7..1322b6a 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. @@ -83,6 +87,11 @@ EXPORT_SYMBOL(cap_netlink_recv); int cap_capable(struct task_struct *tsk, 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) |