Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7389
b: refs/heads/master
c: 0730ded
h: refs/heads/master
i:
  7387: 722803f
v: v3
  • Loading branch information
Jesper Juhl authored and Linus Torvalds committed Sep 7, 2005
1 parent 106885b commit 03446e6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 5acd57936c3224fd86e838201e528e0169373e9b
refs/heads/master: 0730ded5be28653675ed314fdd878b8db5f88aa4
6 changes: 2 additions & 4 deletions trunk/kernel/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -1711,20 +1711,18 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5)
{
long error;
int sig;

error = security_task_prctl(option, arg2, arg3, arg4, arg5);
if (error)
return error;

switch (option) {
case PR_SET_PDEATHSIG:
sig = arg2;
if (!valid_signal(sig)) {
if (!valid_signal(arg2)) {
error = -EINVAL;
break;
}
current->pdeath_signal = sig;
current->pdeath_signal = arg2;
break;
case PR_GET_PDEATHSIG:
error = put_user(current->pdeath_signal, (int __user *)arg2);
Expand Down

0 comments on commit 03446e6

Please sign in to comment.