diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-26 16:54:15 +0530 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-07 18:04:12 -0700 |
| commit | e9a85c71afa38ee304e71c86ca7d74ed4658318c (patch) | |
| tree | 7b02114f23f72fcab725a1e5d00993b732b065f9 /security | |
| parent | 92967117531f1ffe4516a32d9d6c97ec6f1814eb (diff) | |
security: Add proper checks for Android specific capability checks
Commit b641072 ("security: Add AID_NET_RAW and AID_NET_ADMIN capability
check in cap_capable().") introduces additional checks for AID_NET_xxx
macros. Since the header file including those macros are conditionally
included, the checks should also be conditionally executed.
Change-Id: Iaec5208d5b95a46b1ac3f2db8449c661e803fa5b
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 897af00e477..0051ac2d058 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -80,10 +80,12 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb) int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, 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 for (;;) { /* The creator of the user namespace has all caps. */ |