diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2009-06-19 07:15:05 +0800 |
|---|---|---|
| committer | Leo Wang <leozwang@google.com> | 2016-01-19 23:51:36 +0000 |
| commit | ad7beaf0122557e49e8fda511111a88794ebe036 (patch) | |
| tree | bffd61158b6678145e6022d721450234cb885be3 | |
| parent | a80962834035cb8385797b6cae92898f2dad3117 (diff) | |
| download | v4.1-ad7beaf0122557e49e8fda511111a88794ebe036.tar.gz | |
ANDROID: security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Bug: 25923642
Patchset: rk3036 evb bring up
Cherry picked from android-3.18 branch.
(cherry picked from commit 7985836fdfd4ca68842ee9f2995ed7bb6b1a6ac4)
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Change-Id: I72708c2a0d3e33da5712589dcd4580ad8f3a4725
| -rw-r--r-- | include/linux/android_aid.h | 1 | ||||
| -rw-r--r-- | security/commoncap.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/android_aid.h b/include/linux/android_aid.h index dc66530e5fc..3d7a5ead120 100644 --- 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 f2875cd9f67..91f9086d1c6 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. |