summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorHemant Ramdasi <hemant.ramdasi@stericsson.com>2011-09-20 17:53:00 +0530
committerSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>2011-09-21 12:22:27 +0200
commit6a2022b1631ca35017fae0192e8868ffc1b54ab7 (patch)
tree700f294760a90084e1eaeff064bb7dd4f56856a0 /security
parentc2bab3939742c013387296a8f5184bbc63d27a96 (diff)
security: Fix build issue when ANDROID_PARANOID_NETWORK is disabled.
Change-Id: I3fcd52239ce5e526b2a4210b9ea393829dbea494 Signed-off-by: Hemant Ramdasi <hemant.ramdasi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31542 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 1322b6aa648..e508e2b170a 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)