summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/android_aid.h1
-rw-r--r--security/commoncap.c10
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/android_aid.h b/include/linux/android_aid.h
index d22723afbca1..7f16a14c0fe7 100644
--- a/include/linux/android_aid.h
+++ b/include/linux/android_aid.h
@@ -21,5 +21,6 @@
#define AID_NET_BT 3002
#define AID_INET 3003
#define AID_NET_RAW 3004
+#define AID_NET_ADMIN 3005
#endif
diff --git a/security/commoncap.c b/security/commoncap.c
index fe30751a6cd9..ea768866f700 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -28,6 +28,10 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
+#ifdef CONFIG_ANDROID_PARANOID_NETWORK
+#include <linux/android_aid.h>
+#endif
+
/*
* If a non-root user executes a setuid-root binary in
* !secure(SECURE_NOROOT) mode, then we raise capabilities.
@@ -82,6 +86,12 @@ EXPORT_SYMBOL(cap_netlink_recv);
int cap_capable(struct task_struct *tsk, const struct cred *cred, 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
return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
}