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 d22723afbca1db15d2fce27bd298c14acde7e36e..7f16a14c0fe71d1bbd30bc554f4781743816a3aa 100644 (file)
--- 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 9d172e6e330c9fd7906a8a2e5754713f80dfb433..3238b2938893240fd8bcd59d768b5bda0f13f6bb 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -29,6 +29,10 @@
 #include <linux/securebits.h>
 #include <linux/syslog.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, 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;
 }