From 65268b9c274d8fa189790af280ec52fe593123a3 Mon Sep 17 00:00:00 2001 From: Winnie Hsu Date: Mon, 12 Sep 2011 18:32:00 -0700 Subject: security: Add config flag for Android specific caps Add CONFIG_ANDROID_PARANOID_NETWORK inside commoncap.c. Change-Id: I1cf092e9d5465c144e1b5ca022ee4e48f6d5739c Signed-off-by: Winnie Hsu Reviewed-on: http://git-master/r/51930 Reviewed-by: Allen Martin Rebase-Id: R3c12a048ab722a529b4777451335305024ca90db --- security/commoncap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'security') 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) -- cgit v1.2.3