From: Chia-chi Yeh <chiachi@android.com>
Date: Thu, 18 Jun 2009 23:15:05 +0000 (+0800)
Subject: security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
X-Git-Tag: firefly_0821_release~4090^2~841
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=775d748ba7a4c68d02c1410c39bce8750394344c;p=firefly-linux-kernel-4.4.55.git

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 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 c44b6fe6648e..3e81aa978b59 100644
--- 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.
@@ -78,6 +82,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.