From: Tushar Behera Date: Mon, 26 Mar 2012 11:24:15 +0000 (+0530) Subject: ANDROID: net: paranoid: security: Add proper checks for Android specific capability... X-Git-Tag: MMI-PSA29.97-13-9~4254 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f1c8e6f39c8132ff64d6dd0e85b3c80b9feb6fb9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ANDROID: net: paranoid: 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 Signed-off-by: Andrey Konovalov --- diff --git a/security/commoncap.c b/security/commoncap.c index 0bf9f56af612..a00862bcf429 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -77,10 +77,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