1 files changed, 10 insertions, 0 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index a93b3b73307..e508e2b170a 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -29,6 +29,10 @@
 #include <linux/securebits.h>
 #include <linux/user_namespace.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.
@@ -83,6 +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)