| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <48DBD5F3.9000802@ct.jp.nec.com>
Date: Thu, 25 Sep 2008 11:18:27 -0700
From: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
To: Ingo Molnar <mingo@...e.hu>, Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>
Cc: linux-kernel@...r.kernel.org
Subject: [RFC PATCH v2 -tip 4/4] x86: signal: use __{put|get}_user_cerr
From: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
Use __{put|get}_user_cerr for cumulative error handling in x86 signal code.
This makes stack usage and code size small.
The line
err |= __put_user(x, ptr);
is comiled to like this;
a0: 89 fa mov %edi,%edx
a2: 8b 41 20 mov 0x20(%ecx),%eax
a5: 89 46 08 mov %eax,0x8(%esi)
a8: 89 55 b0 mov %edx,-0x50(%ebp)
and the line
__put_user_cerr(x, ptr, &err);
is comiled to like this;
92: 8b 41 20 mov 0x20(%ecx),%eax
95: 89 47 08 mov %eax,0x8(%edi)
and the fixup code on exception looks like this;
00000000 <.fixup>:
0: 83 ce f2 or $0xfffffff2,%esi
3: e9 8a 00 00 00 jmp 92 <.fixup+0x92>
$ size signal_*
text data bss dec hex filename
4507 0 0 4507 119b signal_32.o.new
5031 0 0 5031 13a7 signal_32.o.old
3827 0 0 3827 ef3 signal_64.o.new
4652 0 0 4652 122c signal_64.o.old
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
---
arch/x86/kernel/signal_32.c | 96 +++++++++++++++++++++---------------------
arch/x86/kernel/signal_64.c | 86 +++++++++++++++++++-------------------
2 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 4337cd5..0c72f54 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -126,21 +126,21 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
/* Always make any pending restarted system calls return -EINTR */
current_thread_info()->restart_block.fn = do_no_restart_syscall;
-#define COPY(x) err |= __get_user(regs->x, &sc->x)
+#define COPY(x) __get_user_cerr(regs->x, &sc->x, &err)
#define COPY_SEG(seg) \
{ unsigned short tmp; \
- err |= __get_user(tmp, &sc->seg); \
+ __get_user_cerr(tmp, &sc->seg, &err); \
regs->seg = tmp; }
#define COPY_SEG_STRICT(seg) \
{ unsigned short tmp; \
- err |= __get_user(tmp, &sc->seg); \
+ __get_user_cerr(tmp, &sc->seg, &err); \
regs->seg = tmp|3; }
#define GET_SEG(seg) \
{ unsigned short tmp; \
- err |= __get_user(tmp, &sc->seg); \
+ __get_user_cerr(tmp, &sc->seg, &err); \
loadsegment(seg, tmp); }
GET_SEG(gs);
@@ -155,7 +155,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
{
unsigned int tmpflags;
- err |= __get_user(tmpflags, &sc->flags);
+ __get_user_cerr(tmpflags, &sc->flags, &err);
regs->flags = (regs->flags & ~FIX_EFLAGS) |
(tmpflags & FIX_EFLAGS);
regs->orig_ax = -1; /* disable syscall checks */
@@ -164,11 +164,11 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
{
void __user *buf;
- err |= __get_user(buf, &sc->fpstate);
+ __get_user_cerr(buf, &sc->fpstate, &err);
err |= restore_i387_xstate(buf);
}
- err |= __get_user(*pax, &sc->ax);
+ __get_user_cerr(*pax, &sc->ax, &err);
return err;
}
@@ -262,37 +262,37 @@ setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
{
int tmp, err = 0;
- err |= __put_user(regs->fs, (unsigned int __user *)&sc->fs);
+ __put_user_cerr(regs->fs, (unsigned int __user *)&sc->fs, &err);
savesegment(gs, tmp);
- err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
-
- err |= __put_user(regs->es, (unsigned int __user *)&sc->es);
- err |= __put_user(regs->ds, (unsigned int __user *)&sc->ds);
- err |= __put_user(regs->di, &sc->di);
- err |= __put_user(regs->si, &sc->si);
- err |= __put_user(regs->bp, &sc->bp);
- err |= __put_user(regs->sp, &sc->sp);
- err |= __put_user(regs->bx, &sc->bx);
- err |= __put_user(regs->dx, &sc->dx);
- err |= __put_user(regs->cx, &sc->cx);
- err |= __put_user(regs->ax, &sc->ax);
- err |= __put_user(current->thread.trap_no, &sc->trapno);
- err |= __put_user(current->thread.error_code, &sc->err);
- err |= __put_user(regs->ip, &sc->ip);
- err |= __put_user(regs->cs, (unsigned int __user *)&sc->cs);
- err |= __put_user(regs->flags, &sc->flags);
- err |= __put_user(regs->sp, &sc->sp_at_signal);
- err |= __put_user(regs->ss, (unsigned int __user *)&sc->ss);
+ __put_user_cerr(tmp, (unsigned int __user *)&sc->gs, &err);
+
+ __put_user_cerr(regs->es, (unsigned int __user *)&sc->es, &err);
+ __put_user_cerr(regs->ds, (unsigned int __user *)&sc->ds, &err);
+ __put_user_cerr(regs->di, &sc->di, &err);
+ __put_user_cerr(regs->si, &sc->si, &err);
+ __put_user_cerr(regs->bp, &sc->bp, &err);
+ __put_user_cerr(regs->sp, &sc->sp, &err);
+ __put_user_cerr(regs->bx, &sc->bx, &err);
+ __put_user_cerr(regs->dx, &sc->dx, &err);
+ __put_user_cerr(regs->cx, &sc->cx, &err);
+ __put_user_cerr(regs->ax, &sc->ax, &err);
+ __put_user_cerr(current->thread.trap_no, &sc->trapno, &err);
+ __put_user_cerr(current->thread.error_code, &sc->err, &err);
+ __put_user_cerr(regs->ip, &sc->ip, &err);
+ __put_user_cerr(regs->cs, (unsigned int __user *)&sc->cs, &err);
+ __put_user_cerr(regs->flags, &sc->flags, &err);
+ __put_user_cerr(regs->sp, &sc->sp_at_signal, &err);
+ __put_user_cerr(regs->ss, (unsigned int __user *)&sc->ss, &err);
tmp = save_i387_xstate(fpstate);
if (tmp < 0)
err = 1;
else
- err |= __put_user(tmp ? fpstate : NULL, &sc->fpstate);
+ __put_user_cerr(tmp ? fpstate : NULL, &sc->fpstate, &err);
/* non-iBCS2 extensions.. */
- err |= __put_user(mask, &sc->oldmask);
- err |= __put_user(current->thread.cr2, &sc->cr2);
+ __put_user_cerr(mask, &sc->oldmask, &err);
+ __put_user_cerr(current->thread.cr2, &sc->cr2, &err);
return err;
}
@@ -377,7 +377,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
restorer = ka->sa.sa_restorer;
/* Set up to return from userspace. */
- err |= __put_user(restorer, &frame->pretcode);
+ __put_user_cerr(restorer, &frame->pretcode, &err);
/*
* This is popl %eax ; movl $__NR_sigreturn, %eax ; int $0x80
@@ -386,9 +386,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
- err |= __put_user(0xb858, (short __user *)(frame->retcode+0));
- err |= __put_user(__NR_sigreturn, (int __user *)(frame->retcode+2));
- err |= __put_user(0x80cd, (short __user *)(frame->retcode+6));
+ __put_user_cerr(0xb858, (short __user *)(frame->retcode+0), &err);
+ __put_user_cerr(__NR_sigreturn, (int __user *)(frame->retcode+2), &err);
+ __put_user_cerr(0x80cd, (short __user *)(frame->retcode+6), &err);
if (err)
return -EFAULT;
@@ -421,23 +421,23 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- err |= __put_user(sig, &frame->sig);
- err |= __put_user(&frame->info, &frame->pinfo);
- err |= __put_user(&frame->uc, &frame->puc);
+ __put_user_cerr(sig, &frame->sig, &err);
+ __put_user_cerr(&frame->info, &frame->pinfo, &err);
+ __put_user_cerr(&frame->uc, &frame->puc, &err);
err |= copy_siginfo_to_user(&frame->info, info);
if (err)
return -EFAULT;
/* Create the ucontext. */
if (cpu_has_xsave)
- err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags);
+ __put_user_cerr(UC_FP_XSTATE, &frame->uc.uc_flags, &err);
else
- err |= __put_user(0, &frame->uc.uc_flags);
- err |= __put_user(0, &frame->uc.uc_link);
- err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
- err |= __put_user(sas_ss_flags(regs->sp),
- &frame->uc.uc_stack.ss_flags);
- err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
+ __put_user_cerr(0, &frame->uc.uc_flags, &err);
+ __put_user_cerr(0, &frame->uc.uc_link, &err);
+ __put_user_cerr(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp, &err);
+ __put_user_cerr(sas_ss_flags(regs->sp),
+ &frame->uc.uc_stack.ss_flags, &err);
+ __put_user_cerr(current->sas_ss_size, &frame->uc.uc_stack.ss_size, &err);
err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -448,7 +448,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
- err |= __put_user(restorer, &frame->pretcode);
+ __put_user_cerr(restorer, &frame->pretcode, &err);
/*
* This is movl $__NR_rt_sigreturn, %ax ; int $0x80
@@ -457,9 +457,9 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
- err |= __put_user(0xb8, (char __user *)(frame->retcode+0));
- err |= __put_user(__NR_rt_sigreturn, (int __user *)(frame->retcode+1));
- err |= __put_user(0x80cd, (short __user *)(frame->retcode+5));
+ __put_user_cerr(0xb8, (char __user *)(frame->retcode+0), &err);
+ __put_user_cerr(__NR_rt_sigreturn, (int __user *)(frame->retcode+1), &err);
+ __put_user_cerr(0x80cd, (short __user *)(frame->retcode+5), &err);
if (err)
return -EFAULT;
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 53f86d9..2d0f220 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -64,7 +64,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
/* Always make any pending restarted system calls return -EINTR */
current_thread_info()->restart_block.fn = do_no_restart_syscall;
-#define COPY(x) (err |= __get_user(regs->x, &sc->x))
+#define COPY(x) __get_user_cerr(regs->x, &sc->x, &err)
COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
COPY(dx); COPY(cx); COPY(ip);
@@ -82,13 +82,13 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
* App's signal handler can save/restore other segments if needed. */
{
unsigned cs;
- err |= __get_user(cs, &sc->cs);
+ __get_user_cerr(cs, &sc->cs, &err);
regs->cs = cs | 3; /* Force into user mode */
}
{
unsigned int tmpflags;
- err |= __get_user(tmpflags, &sc->flags);
+ __get_user_cerr(tmpflags, &sc->flags, &err);
regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
regs->orig_ax = -1; /* disable syscall checks */
}
@@ -96,11 +96,11 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
{
void __user *buf;
- err |= __get_user(buf, &sc->fpstate);
+ __get_user_cerr(buf, &sc->fpstate, &err);
err |= restore_i387_xstate(buf);
}
- err |= __get_user(*pax, &sc->ax);
+ __get_user_cerr(*pax, &sc->ax, &err);
return err;
}
@@ -150,32 +150,32 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
{
int err = 0;
- err |= __put_user(regs->cs, &sc->cs);
- err |= __put_user(0, &sc->gs);
- err |= __put_user(0, &sc->fs);
-
- err |= __put_user(regs->di, &sc->di);
- err |= __put_user(regs->si, &sc->si);
- err |= __put_user(regs->bp, &sc->bp);
- err |= __put_user(regs->sp, &sc->sp);
- err |= __put_user(regs->bx, &sc->bx);
- err |= __put_user(regs->dx, &sc->dx);
- err |= __put_user(regs->cx, &sc->cx);
- err |= __put_user(regs->ax, &sc->ax);
- err |= __put_user(regs->r8, &sc->r8);
- err |= __put_user(regs->r9, &sc->r9);
- err |= __put_user(regs->r10, &sc->r10);
- err |= __put_user(regs->r11, &sc->r11);
- err |= __put_user(regs->r12, &sc->r12);
- err |= __put_user(regs->r13, &sc->r13);
- err |= __put_user(regs->r14, &sc->r14);
- err |= __put_user(regs->r15, &sc->r15);
- err |= __put_user(me->thread.trap_no, &sc->trapno);
- err |= __put_user(me->thread.error_code, &sc->err);
- err |= __put_user(regs->ip, &sc->ip);
- err |= __put_user(regs->flags, &sc->flags);
- err |= __put_user(mask, &sc->oldmask);
- err |= __put_user(me->thread.cr2, &sc->cr2);
+ __put_user_cerr(regs->cs, &sc->cs, &err);
+ __put_user_cerr(0, &sc->gs, &err);
+ __put_user_cerr(0, &sc->fs, &err);
+
+ __put_user_cerr(regs->di, &sc->di, &err);
+ __put_user_cerr(regs->si, &sc->si, &err);
+ __put_user_cerr(regs->bp, &sc->bp, &err);
+ __put_user_cerr(regs->sp, &sc->sp, &err);
+ __put_user_cerr(regs->bx, &sc->bx, &err);
+ __put_user_cerr(regs->dx, &sc->dx, &err);
+ __put_user_cerr(regs->cx, &sc->cx, &err);
+ __put_user_cerr(regs->ax, &sc->ax, &err);
+ __put_user_cerr(regs->r8, &sc->r8, &err);
+ __put_user_cerr(regs->r9, &sc->r9, &err);
+ __put_user_cerr(regs->r10, &sc->r10, &err);
+ __put_user_cerr(regs->r11, &sc->r11, &err);
+ __put_user_cerr(regs->r12, &sc->r12, &err);
+ __put_user_cerr(regs->r13, &sc->r13, &err);
+ __put_user_cerr(regs->r14, &sc->r14, &err);
+ __put_user_cerr(regs->r15, &sc->r15, &err);
+ __put_user_cerr(me->thread.trap_no, &sc->trapno, &err);
+ __put_user_cerr(me->thread.error_code, &sc->err, &err);
+ __put_user_cerr(regs->ip, &sc->ip, &err);
+ __put_user_cerr(regs->flags, &sc->flags, &err);
+ __put_user_cerr(mask, &sc->oldmask, &err);
+ __put_user_cerr(me->thread.cr2, &sc->cr2, &err);
return err;
}
@@ -229,19 +229,19 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Create the ucontext. */
if (cpu_has_xsave)
- err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags);
+ __put_user_cerr(UC_FP_XSTATE, &frame->uc.uc_flags, &err);
else
- err |= __put_user(0, &frame->uc.uc_flags);
- err |= __put_user(0, &frame->uc.uc_link);
- err |= __put_user(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
- err |= __put_user(sas_ss_flags(regs->sp),
- &frame->uc.uc_stack.ss_flags);
- err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
- err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
- err |= __put_user(fp, &frame->uc.uc_mcontext.fpstate);
+ __put_user_cerr(0, &frame->uc.uc_flags, &err);
+ __put_user_cerr(0, &frame->uc.uc_link, &err);
+ __put_user_cerr(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp, &err);
+ __put_user_cerr(sas_ss_flags(regs->sp),
+ &frame->uc.uc_stack.ss_flags, &err);
+ __put_user_cerr(me->sas_ss_size, &frame->uc.uc_stack.ss_size, &err);
+ setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
+ __put_user_cerr(fp, &frame->uc.uc_mcontext.fpstate, &err);
if (sizeof(*set) == 16) {
- __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
- __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
+ __put_user_cerr(set->sig[0], &frame->uc.uc_sigmask.sig[0], &err);
+ __put_user_cerr(set->sig[1], &frame->uc.uc_sigmask.sig[1], &err);
} else
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -249,7 +249,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
already in userspace. */
/* x86-64 should always use SA_RESTORER. */
if (ka->sa.sa_flags & SA_RESTORER) {
- err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
+ __put_user_cerr(ka->sa.sa_restorer, &frame->pretcode, &err);
} else {
/* could use a vstub here */
return -EFAULT;
--
1.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists