git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
xtensa
/
kernel
/
signal.c
diff --git
a/arch/xtensa/kernel/signal.c
b/arch/xtensa/kernel/signal.c
index
e252b61
..
c494f08
100644
(file)
--- a/
arch/xtensa/kernel/signal.c
+++ b/
arch/xtensa/kernel/signal.c
@@
-104,7
+104,7
@@
sys_sigaction(int sig, const struct old_sigaction *act,
if (act) {
old_sigset_t mask;
if (act) {
old_sigset_t mask;
- if (
verify_area
(VERIFY_READ, act, sizeof(*act)) ||
+ if (
!access_ok
(VERIFY_READ, act, sizeof(*act)) ||
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
return -EFAULT;
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
return -EFAULT;
@@
-116,7
+116,7
@@
sys_sigaction(int sig, const struct old_sigaction *act,
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
if (!ret && oact) {
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
if (!ret && oact) {
- if (
verify_area
(VERIFY_WRITE, oact, sizeof(*oact)) ||
+ if (
!access_ok
(VERIFY_WRITE, oact, sizeof(*oact)) ||
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
return -EFAULT;
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
return -EFAULT;
@@
-236,7
+236,7
@@
restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
err |= __copy_from_user (regs->areg, sc->sc_areg, XCHAL_NUM_AREGS*4);
err |= __get_user(buf, &sc->sc_cpstate);
if (buf) {
err |= __copy_from_user (regs->areg, sc->sc_areg, XCHAL_NUM_AREGS*4);
err |= __get_user(buf, &sc->sc_cpstate);
if (buf) {
- if (
verify_area
(VERIFY_READ, buf, sizeof(*buf)))
+ if (
!access_ok
(VERIFY_READ, buf, sizeof(*buf)))
goto badframe;
err |= restore_cpextra(buf);
}
goto badframe;
err |= restore_cpextra(buf);
}
@@
-357,7
+357,7
@@
asmlinkage int sys_sigreturn(struct pt_regs *regs)
if (regs->depc > 64)
panic ("Double exception sys_sigreturn\n");
if (regs->depc > 64)
panic ("Double exception sys_sigreturn\n");
- if (
verify_area
(VERIFY_READ, frame, sizeof(*frame)))
+ if (
!access_ok
(VERIFY_READ, frame, sizeof(*frame)))
goto badframe;
if (__get_user(set.sig[0], &frame->sc.oldmask)
goto badframe;
if (__get_user(set.sig[0], &frame->sc.oldmask)
@@
-394,7
+394,7
@@
asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
return 0;
}
return 0;
}
- if (
verify_area
(VERIFY_READ, frame, sizeof(*frame)))
+ if (
!access_ok
(VERIFY_READ, frame, sizeof(*frame)))
goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
@@
-433,7
+433,7
@@
badframe:
static inline void *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
static inline void *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
- if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && !
on_sig_stack
(sp))
+ if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && !
sas_ss_flags
(sp))
sp = current->sas_ss_sp + current->sas_ss_size;
return (void *)((sp - frame_size) & -16ul);
sp = current->sas_ss_sp + current->sas_ss_size;
return (void *)((sp - frame_size) & -16ul);