summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-03-21 18:38:41 -0700
committerJohn Stultz <john.stultz@linaro.org>2012-03-21 18:38:41 -0700
commit1df760f233995de856f6a54326267d0987fdb85d (patch)
tree037444c9977d5fb0eb16fe75c6d1c5dbbaed20d1
parent5275e74ae5e7e92b05bd1361e2573bb38d381358 (diff)
android-paranoid-net: Fix compile issue
This gets rid of the "'AID_NET_RAW' and 'AID_NET_ADMIN' undeclared" compilation error. Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--security/commoncap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 5bfc35b9b56..d7299c4bd6f 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -78,10 +78,12 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
int cap_capable(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. */