diff options
author | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
commit | 10d832d607c621c101922442f4771737296e1241 (patch) | |
tree | 421229d6bb43c301bbf5eb97b11c5901aae66e08 /arch/sparc/kernel/sigutil_64.c | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
download | lwn-10d832d607c621c101922442f4771737296e1241.tar.gz lwn-10d832d607c621c101922442f4771737296e1241.zip |
Merge tag 'ib-mfd-regulator-arm-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-rn5t618
Immutable branch between MFD, Regulator and ARM, due for v4.8
Diffstat (limited to 'arch/sparc/kernel/sigutil_64.c')
-rw-r--r-- | arch/sparc/kernel/sigutil_64.c | 10 |
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; |