aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2017-07-31 18:18:40 -0400
committerEric W. Biederman <ebiederm@xmission.com>2018-01-15 19:01:19 -0500
commiteb5346c379cb272eca77f63473de09103a22ebee (patch)
tree7498ca1fe0c24a8300e8bad70642bbb9de8f5342
parent212a36a17efe4d696d1e3c31ebd79a9fb0cbb14b (diff)
signal: Remove the code to clear siginfo before calling copy_siginfo_from_user32
The new unified copy_siginfo_from_user32 takes care of this. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--kernel/ptrace.c1
-rw-r--r--kernel/signal.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 84b1367935e4..ec4365da9be8 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -1226,7 +1226,6 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
1226 break; 1226 break;
1227 1227
1228 case PTRACE_SETSIGINFO: 1228 case PTRACE_SETSIGINFO:
1229 memset(&siginfo, 0, sizeof siginfo);
1230 if (copy_siginfo_from_user32( 1229 if (copy_siginfo_from_user32(
1231 &siginfo, (struct compat_siginfo __user *) datap)) 1230 &siginfo, (struct compat_siginfo __user *) datap))
1232 ret = -EFAULT; 1231 ret = -EFAULT;
diff --git a/kernel/signal.c b/kernel/signal.c
index 5211b1b57163..bebe44265b8b 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3155,7 +3155,7 @@ COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo,
3155 int, sig, 3155 int, sig,
3156 struct compat_siginfo __user *, uinfo) 3156 struct compat_siginfo __user *, uinfo)
3157{ 3157{
3158 siginfo_t info = {}; 3158 siginfo_t info;
3159 int ret = copy_siginfo_from_user32(&info, uinfo); 3159 int ret = copy_siginfo_from_user32(&info, uinfo);
3160 if (unlikely(ret)) 3160 if (unlikely(ret))
3161 return ret; 3161 return ret;
@@ -3199,7 +3199,7 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo,
3199 int, sig, 3199 int, sig,
3200 struct compat_siginfo __user *, uinfo) 3200 struct compat_siginfo __user *, uinfo)
3201{ 3201{
3202 siginfo_t info = {}; 3202 siginfo_t info;
3203 3203
3204 if (copy_siginfo_from_user32(&info, uinfo)) 3204 if (copy_siginfo_from_user32(&info, uinfo))
3205 return -EFAULT; 3205 return -EFAULT;