summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/sigutil_64.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-28 21:21:31 -0700
committerDavid S. Miller <davem@davemloft.net>2016-05-29 11:24:05 -0700
commitd11c2a0de2824395656cf8ed15811580c9dd38aa (patch)
tree1a2024f157752d35d4ac42807c6ca1da7b52b58c /arch/sparc/kernel/sigutil_64.c
parent9ea46abe22550e3366ff7cee2f8391b35b12f730 (diff)
downloadlinux-d11c2a0de2824395656cf8ed15811580c9dd38aa.tar.gz
linux-d11c2a0de2824395656cf8ed15811580c9dd38aa.tar.bz2
linux-d11c2a0de2824395656cf8ed15811580c9dd38aa.zip
sparc: Harden signal return frame checks.
All signal frames must be at least 16-byte aligned, because that is the alignment we explicitly create when we build signal return stack frames. All stack pointers must be at least 8-byte aligned. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/sigutil_64.c')
-rw-r--r--arch/sparc/kernel/sigutil_64.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sigutil_64.c b/arch/sparc/kernel/sigutil_64.c
index 387834a9c56a..36aadcbeac69 100644
--- a/arch/sparc/kernel/sigutil_64.c
+++ b/arch/sparc/kernel/sigutil_64.c
@@ -37,7 +37,10 @@ int restore_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu)
unsigned long fprs;
int err;
- err = __get_user(fprs, &fpu->si_fprs);
+ if (((unsigned long) fpu) & 7)
+ return -EFAULT;
+
+ err = get_user(fprs, &fpu->si_fprs);
fprs_write(0);
regs->tstate &= ~TSTATE_PEF;
if (fprs & FPRS_DL)
@@ -72,7 +75,10 @@ int restore_rwin_state(__siginfo_rwin_t __user *rp)
struct thread_info *t = current_thread_info();
int i, wsaved, err;
- __get_user(wsaved, &rp->wsaved);
+ if (((unsigned long) rp) & 7)
+ return -EFAULT;
+
+ get_user(wsaved, &rp->wsaved);
if (wsaved > NSWINS)
return -EFAULT;