diff options
| author | Lee Jones <lee.jones@linaro.org> | 2011-07-26 17:31:06 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2011-07-26 17:35:08 +0100 |
| commit | 6f914cb1efe4aba81bb841ec8f4f5636163c0586 (patch) | |
| tree | 7ef04a88618a05c53faa2fd4ccd03e90c06a89bd /security | |
| parent | 232bdfad970ce35177ca12c5527d1c96f7ce44f1 (diff) | |
Apply mega patch to make GLK the ALK
Signed-off-by: Lee Jones <lee.jones@linaro.org>
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 a93b3b73307..1322b6aa648 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) |