aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2009-06-19 07:15:05 +0800
committerArve Hjønnevåg <arve@android.com>2013-04-29 14:42:31 -0700
commit6c23fc8eab2f407de6fdde96da149e4babe1041a (patch)
tree3360d9206dca947b94b4a8e5c9de4e258f4b0c0c /security
parent6c7868da7a53d7e28f788ffa84f9e822e8465ea1 (diff)
security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index c44b6fe6648..3e81aa978b5 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.