diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /security/commoncap.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 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 5aba82679a0b..bb0c095f5761 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -552,7 +552,7 @@ int cap_task_kill(struct task_struct *p, struct siginfo *info, | |||
| 552 | * allowed. | 552 | * allowed. |
| 553 | * We must preserve legacy signal behavior in this case. | 553 | * We must preserve legacy signal behavior in this case. |
| 554 | */ | 554 | */ |
| 555 | if (p->euid == 0 && p->uid == current->uid) | 555 | if (p->uid == current->uid) |
| 556 | return 0; | 556 | return 0; |
| 557 | 557 | ||
| 558 | /* sigcont is permitted within same session */ | 558 | /* sigcont is permitted within same session */ |