diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-02-10 10:28:49 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-02-10 10:28:49 +1100 |
| commit | a2a15479d617ebbab67c60b4eed02524536af780 (patch) | |
| tree | 64c4a5bbf434b003f02f56edda845e89fd539a7a /security/security.c | |
| parent | e2241be62deabe09d7c681326fcb0bc707082147 (diff) | |
| parent | 1ea0ce40690dff38935538e8dab7b12683ded0d3 (diff) | |
Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/security/security.c b/security/security.c index f0a802ee29b6..d0e07f269b2d 100644 --- a/security/security.c +++ b/security/security.c @@ -1063,11 +1063,6 @@ int security_task_kill(struct task_struct *p, struct siginfo *info, return call_int_hook(task_kill, 0, p, info, sig, secid); } -int security_task_wait(struct task_struct *p) -{ - return call_int_hook(task_wait, 0, p); -} - int security_task_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { @@ -1208,9 +1203,9 @@ int security_getprocattr(struct task_struct *p, char *name, char **value) return call_int_hook(getprocattr, -EINVAL, p, name, value); } -int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size) +int security_setprocattr(const char *name, void *value, size_t size) { - return call_int_hook(setprocattr, -EINVAL, p, name, value, size); + return call_int_hook(setprocattr, -EINVAL, name, value, size); } int security_netlink_send(struct sock *sk, struct sk_buff *skb) @@ -1807,7 +1802,6 @@ struct security_hook_heads security_hook_heads = { .task_movememory = LIST_HEAD_INIT(security_hook_heads.task_movememory), .task_kill = LIST_HEAD_INIT(security_hook_heads.task_kill), - .task_wait = LIST_HEAD_INIT(security_hook_heads.task_wait), .task_prctl = LIST_HEAD_INIT(security_hook_heads.task_prctl), .task_to_inode = LIST_HEAD_INIT(security_hook_heads.task_to_inode), |