diff options
| author | Winnie Hsu <whsu@nvidia.com> | 2011-09-12 18:32:00 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:27 -0800 |
| commit | 65268b9c274d8fa189790af280ec52fe593123a3 (patch) | |
| tree | a4fb527c7da00ad3389e13f274bfa0ab4c76eb0e /security/commoncap.c | |
| parent | 20c49425a92c8ec0dc93ea74782c00a5cd888090 (diff) | |
security: Add config flag for Android specific caps
Add CONFIG_ANDROID_PARANOID_NETWORK inside commoncap.c.
Change-Id: I1cf092e9d5465c144e1b5ca022ee4e48f6d5739c
Signed-off-by: Winnie Hsu <whsu@nvidia.com>
Reviewed-on: http://git-master/r/51930
Reviewed-by: Allen Martin <amartin@nvidia.com>
Rebase-Id: R3c12a048ab722a529b4777451335305024ca90db
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 1322b6aa648d..e508e2b170a8 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -87,11 +87,12 @@ 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) { +#ifdef CONFIG_ANDROID_PARANOID_NETWORK 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; - +#endif for (;;) { /* The creator of the user namespace has all caps. */ if (targ_ns != &init_user_ns && targ_ns->creator == cred->user) |