security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().

Signed-off-by: Chia-chi Yeh <chiachi@android.com>

diff --git a/include/linux/android_aid.h b/include/linux/android_aid.h
index dc66530e5fc74452bd0a8b9645c8132372a4012c..3d7a5ead120045f18adaeb769d7998f023e68f24 100644 (file)
--- a/include/linux/android_aid.h
+++ b/include/linux/android_aid.h
@@ -21,5 +21,6 @@
 #define AID_OBSOLETE_001 KGIDT_INIT(3002)  /* was NET_BT */
 #define AID_INET         KGIDT_INIT(3003)
 #define AID_NET_RAW      KGIDT_INIT(3004)
+#define AID_NET_ADMIN    KGIDT_INIT(3005)
 
 #endif

diff --git a/security/commoncap.c b/security/commoncap.c
index 1832cf701c3d6d44d90adeb278bd04bca489d274..978bd9f852f791ac53dc1a93e9d5bed3fd921673 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -31,6 +31,10 @@
 #include <linux/binfmts.h>
 #include <linux/personality.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.
@@ -73,6 +77,11 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
 {
        struct user_namespace *ns = targ_ns;
 
+       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;
+
        /* See if cred has the capability in the target user namespace
         * by examining the target user namespace and all of the target
         * user namespace's parents.