DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

security: fix compilation errors when CONFIG_ANDROID_PARANOID_NETWORK=n

Browse Source 
Compilation fails when CONFIG_ANDROID_PARANOID_NETWORK is not defined since
AID_NET_RAW and AID_NET_ADMIN don't exist.  Since these group checks are only
valid for Android configurations, remove the checks when
CONFIG_ANDROID_PARANOID_NETWORK is disabled.

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
This commit is contained in:
Bryan Huntsman
2011-09-13 17:47:05 -07:00
parent e3e897cb7d
commit 524ef31215
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/commoncap.c
View File

@@ -87,10 +87,12 @@ EXPORT_SYMBOL(cap_netlink_recv);
int cap_capable(struct task_struct *tsk, const struct cred *cred, int cap_capable(struct task_struct *tsk, const struct cred *cred,
struct user_namespace *targ_ns, int cap, int audit) 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)) if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
return 0; return 0;
if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN)) if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN))
return 0; return 0;
#endif
for (;;) { for (;;) {
/* The creator of the user namespace has all caps. */ /* The creator of the user namespace has all caps. */