diff options
| author | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /security/commoncap.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index e4c4b3fc0c04..399bfdb9e2da 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -541,7 +541,7 @@ int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, | |||
| 541 | * yet with increased caps. | 541 | * yet with increased caps. |
| 542 | * So we check for increased caps on the target process. | 542 | * So we check for increased caps on the target process. |
| 543 | */ | 543 | */ |
| 544 | static inline int cap_safe_nice(struct task_struct *p) | 544 | static int cap_safe_nice(struct task_struct *p) |
| 545 | { | 545 | { |
| 546 | if (!cap_issubset(p->cap_permitted, current->cap_permitted) && | 546 | if (!cap_issubset(p->cap_permitted, current->cap_permitted) && |
| 547 | !capable(CAP_SYS_NICE)) | 547 | !capable(CAP_SYS_NICE)) |