aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-02-24 08:17:26 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2013-02-24 08:17:26 +0700
commitade046f9db4d92795249a3e3ce2b8cebf6dce0c7 (patch)
tree284a7f14782adcfab0f784d9c4b52c75b7e2f25b
parent5f9dde0757e557d16685d29b21a6055025ec252e (diff)
downloadkernel_samsung_aries-ade046f9db4d92795249a3e3ce2b8cebf6dce0c7.zip
kernel_samsung_aries-ade046f9db4d92795249a3e3ce2b8cebf6dce0c7.tar.gz
kernel_samsung_aries-ade046f9db4d92795249a3e3ce2b8cebf6dce0c7.tar.bz2
security: commoncap: fix compile without CONFIG_ANDROID_PARANOID_NETWORK
Change-Id: Ie9231808102bb13c3261965372057a20208a44e7
-rw-r--r--security/commoncap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index ccfe568..8bfbd13 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -88,10 +88,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. */