Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198735
b: refs/heads/master
c: 065add3
h: refs/heads/master
i:
  198733: 2f95d9a
  198731: 7e66846
  198727: efd2730
  198719: 8cded3b
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed May 27, 2010
1 parent e39b342 commit 120599c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e0129ef91ed758c06b6557c36124acfb2e1c7305
refs/heads/master: 065add3941bdca54fe04ed3471a96bce9af88793
6 changes: 4 additions & 2 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ static inline bool si_fromuser(const struct siginfo *info)
static int check_kill_permission(int sig, struct siginfo *info,
struct task_struct *t)
{
const struct cred *cred = current_cred(), *tcred;
const struct cred *cred, *tcred;
struct pid *sid;
int error;

Expand All @@ -656,8 +656,10 @@ static int check_kill_permission(int sig, struct siginfo *info,
if (error)
return error;

cred = current_cred();
tcred = __task_cred(t);
if ((cred->euid ^ tcred->suid) &&
if (!same_thread_group(current, t) &&
(cred->euid ^ tcred->suid) &&
(cred->euid ^ tcred->uid) &&
(cred->uid ^ tcred->suid) &&
(cred->uid ^ tcred->uid) &&
Expand Down

0 comments on commit 120599c

Please sign in to comment.