git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
kernel
/
seccomp.c
diff --git
a/kernel/seccomp.c
b/kernel/seccomp.c
index 61bd9dc260c8ea6cc880e6f27bd552eb2e075586..940fa408a288f778fed1e61fa004cbf6e8fdac75 100644
(file)
--- a/
kernel/seccomp.c
+++ b/
kernel/seccomp.c
@@
-515,7
+515,7
@@
void put_seccomp_filter(struct task_struct *tsk)
static void seccomp_init_siginfo(siginfo_t *info, int syscall, int reason)
{
-
memset(info, 0, sizeof(*info)
);
+
clear_siginfo(info
);
info->si_signo = SIGSYS;
info->si_code = SYS_SECCOMP;
info->si_call_addr = (void __user *)KSTK_EIP(current);