diff options
| author | Kejun ZHOU <kejun.zhou@linaro.org> | 2012-02-29 11:34:17 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-02-29 11:00:42 +0100 |
| commit | 789442c999644602d7ad441424eb894f64a7a753 (patch) | |
| tree | 1290aaa841cfb81cfb13b5ba1dc7fc46fc7f76a9 /security/commoncap.c | |
| parent | d0b78cc166e7b7f8d5c1ed609f56e74523425a80 (diff) | |
For #860588 Snowball: Bluetooth Turn ON Fails.stable-android-ux500-3.1
Signed-off-by: Kejun ZHOU <kejun.zhou@linaro.org>
Diffstat (limited to 'security/commoncap.c')
| -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 1322b6aa648..da21e7c93e4 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -87,10 +87,12 @@ EXPORT_SYMBOL(cap_netlink_recv); int cap_capable(struct task_struct *tsk, 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. */ |