diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-26 16:54:15 +0530 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-04-29 14:42:48 -0700 |
| commit | 018ac14eac093dfa5938e8648793800bf296f1e4 (patch) | |
| tree | c4cbb4f2a6249d3032229b6fd77572e0ec9fe1f3 /security | |
| parent | 94bc2c6ede992f89e2889509b94c162f5bee4178 (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 3e81aa978b5..5870fdc224b 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -82,10 +82,12 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, { struct user_namespace *ns = targ_ns; +#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 /* See if cred has the capability in the target user namespace * by examining the target user namespace and all of the target |