2005-04-17 02:20:36 +04:00
/*
2011-08-18 23:10:39 +04:00
* Copyright ( C ) 2003 PathScale , Inc .
* Copyright ( C ) 2003 - 2007 Jeff Dike ( jdike @ { addtoit , linux . intel } . com )
2005-04-17 02:20:36 +04:00
* Licensed under the GPL
*/
2011-08-18 23:10:39 +04:00
# include <linux/personality.h>
2008-01-30 15:31:08 +03:00
# include <linux/ptrace.h>
2011-08-18 23:10:39 +04:00
# include <linux/kernel.h>
2008-01-30 15:31:08 +03:00
# include <asm/unistd.h>
2016-12-24 22:46:01 +03:00
# include <linux/uaccess.h>
2008-01-30 15:31:08 +03:00
# include <asm/ucontext.h>
2012-10-08 06:27:32 +04:00
# include <frame_kern.h>
# include <skas.h>
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_32
2007-10-16 12:27:15 +04:00
/*
* FPU tag word conversions .
*/
static inline unsigned short twd_i387_to_fxsr ( unsigned short twd )
{
unsigned int tmp ; /* to avoid 16 bit prefixes in the code */
/* Transform each pair of bits into 01 (valid) or 00 (empty) */
tmp = ~ twd ;
tmp = ( tmp | ( tmp > > 1 ) ) & 0x5555 ; /* 0V0V0V0V0V0V0V0V */
/* and move the valid bits to the lower byte. */
tmp = ( tmp | ( tmp > > 1 ) ) & 0x3333 ; /* 00VV00VV00VV00VV */
tmp = ( tmp | ( tmp > > 2 ) ) & 0x0f0f ; /* 0000VVVV0000VVVV */
tmp = ( tmp | ( tmp > > 4 ) ) & 0x00ff ; /* 00000000VVVVVVVV */
return tmp ;
}
static inline unsigned long twd_fxsr_to_i387 ( struct user_fxsr_struct * fxsave )
{
struct _fpxreg * st = NULL ;
unsigned long twd = ( unsigned long ) fxsave - > twd ;
unsigned long tag ;
unsigned long ret = 0xffff0000 ;
int i ;
2011-07-14 16:07:13 +04:00
# define FPREG_ADDR(f, n) ((char *)&(f)->st_space + (n) * 16)
2007-10-16 12:27:15 +04:00
for ( i = 0 ; i < 8 ; i + + ) {
if ( twd & 0x1 ) {
st = ( struct _fpxreg * ) FPREG_ADDR ( fxsave , i ) ;
switch ( st - > exponent & 0x7fff ) {
case 0x7fff :
tag = 2 ; /* Special */
break ;
case 0x0000 :
if ( ! st - > significand [ 0 ] & &
! st - > significand [ 1 ] & &
! st - > significand [ 2 ] & &
! st - > significand [ 3 ] ) {
tag = 1 ; /* Zero */
} else {
tag = 2 ; /* Special */
}
break ;
default :
if ( st - > significand [ 3 ] & 0x8000 ) {
tag = 0 ; /* Valid */
} else {
tag = 2 ; /* Special */
}
break ;
}
} else {
tag = 3 ; /* Empty */
}
ret | = ( tag < < ( 2 * i ) ) ;
twd = twd > > 1 ;
}
return ret ;
}
static int convert_fxsr_to_user ( struct _fpstate __user * buf ,
struct user_fxsr_struct * fxsave )
{
unsigned long env [ 7 ] ;
struct _fpreg __user * to ;
struct _fpxreg * from ;
int i ;
env [ 0 ] = ( unsigned long ) fxsave - > cwd | 0xffff0000ul ;
env [ 1 ] = ( unsigned long ) fxsave - > swd | 0xffff0000ul ;
env [ 2 ] = twd_fxsr_to_i387 ( fxsave ) ;
env [ 3 ] = fxsave - > fip ;
env [ 4 ] = fxsave - > fcs | ( ( unsigned long ) fxsave - > fop < < 16 ) ;
env [ 5 ] = fxsave - > foo ;
env [ 6 ] = fxsave - > fos ;
if ( __copy_to_user ( buf , env , 7 * sizeof ( unsigned long ) ) )
return 1 ;
to = & buf - > _st [ 0 ] ;
from = ( struct _fpxreg * ) & fxsave - > st_space [ 0 ] ;
for ( i = 0 ; i < 8 ; i + + , to + + , from + + ) {
unsigned long __user * t = ( unsigned long __user * ) to ;
unsigned long * f = ( unsigned long * ) from ;
if ( __put_user ( * f , t ) | |
__put_user ( * ( f + 1 ) , t + 1 ) | |
__put_user ( from - > exponent , & to - > exponent ) )
return 1 ;
}
return 0 ;
}
static int convert_fxsr_from_user ( struct user_fxsr_struct * fxsave ,
struct _fpstate __user * buf )
{
unsigned long env [ 7 ] ;
struct _fpxreg * to ;
struct _fpreg __user * from ;
int i ;
if ( copy_from_user ( env , buf , 7 * sizeof ( long ) ) )
return 1 ;
fxsave - > cwd = ( unsigned short ) ( env [ 0 ] & 0xffff ) ;
fxsave - > swd = ( unsigned short ) ( env [ 1 ] & 0xffff ) ;
fxsave - > twd = twd_i387_to_fxsr ( ( unsigned short ) ( env [ 2 ] & 0xffff ) ) ;
fxsave - > fip = env [ 3 ] ;
fxsave - > fop = ( unsigned short ) ( ( env [ 4 ] & 0xffff0000ul ) > > 16 ) ;
fxsave - > fcs = ( env [ 4 ] & 0xffff ) ;
fxsave - > foo = env [ 5 ] ;
fxsave - > fos = env [ 6 ] ;
to = ( struct _fpxreg * ) & fxsave - > st_space [ 0 ] ;
from = & buf - > _st [ 0 ] ;
for ( i = 0 ; i < 8 ; i + + , to + + , from + + ) {
unsigned long * t = ( unsigned long * ) to ;
unsigned long __user * f = ( unsigned long __user * ) from ;
if ( __get_user ( * t , f ) | |
__get_user ( * ( t + 1 ) , f + 1 ) | |
__get_user ( to - > exponent , & from - > exponent ) )
return 1 ;
}
return 0 ;
}
extern int have_fpx_regs ;
2011-08-18 23:10:39 +04:00
# endif
2007-10-16 12:26:58 +04:00
static int copy_sc_from_user ( struct pt_regs * regs ,
struct sigcontext __user * from )
2005-04-17 02:20:36 +04:00
{
2007-10-16 12:27:15 +04:00
struct sigcontext sc ;
2008-02-05 09:30:54 +03:00
int err , pid ;
2005-04-17 02:20:36 +04:00
2012-04-22 11:27:28 +04:00
/* Always make any pending restarted system calls return -EINTR */
2015-02-13 02:01:14 +03:00
current - > restart_block . fn = do_no_restart_syscall ;
2012-04-22 11:27:28 +04:00
2005-04-17 02:20:36 +04:00
err = copy_from_user ( & sc , from , sizeof ( sc ) ) ;
2007-10-16 12:27:00 +04:00
if ( err )
2007-05-07 01:51:24 +04:00
return err ;
2005-04-17 02:20:36 +04:00
2011-08-18 23:00:49 +04:00
# define GETREG(regno, regname) regs->regs.gp[HOST_##regno] = sc.regname
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_32
2011-08-18 23:00:49 +04:00
GETREG ( GS , gs ) ;
GETREG ( FS , fs ) ;
GETREG ( ES , es ) ;
GETREG ( DS , ds ) ;
2011-08-18 23:10:39 +04:00
# endif
2011-08-18 23:10:09 +04:00
GETREG ( DI , di ) ;
GETREG ( SI , si ) ;
GETREG ( BP , bp ) ;
2011-08-18 23:00:49 +04:00
GETREG ( SP , sp ) ;
2011-08-18 23:10:09 +04:00
GETREG ( BX , bx ) ;
GETREG ( DX , dx ) ;
GETREG ( CX , cx ) ;
GETREG ( AX , ax ) ;
2011-08-18 23:00:49 +04:00
GETREG ( IP , ip ) ;
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_64
GETREG ( R8 , r8 ) ;
GETREG ( R9 , r9 ) ;
GETREG ( R10 , r10 ) ;
GETREG ( R11 , r11 ) ;
GETREG ( R12 , r12 ) ;
GETREG ( R13 , r13 ) ;
GETREG ( R14 , r14 ) ;
GETREG ( R15 , r15 ) ;
# endif
2011-08-18 23:00:49 +04:00
GETREG ( CS , cs ) ;
GETREG ( EFLAGS , flags ) ;
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_32
2011-08-18 23:00:49 +04:00
GETREG ( SS , ss ) ;
2011-08-18 23:10:39 +04:00
# endif
2011-08-18 23:00:49 +04:00
# undef GETREG
2011-08-18 23:10:39 +04:00
pid = userspace_pid [ current_thread_info ( ) - > cpu ] ;
# ifdef CONFIG_X86_32
2007-10-16 12:27:15 +04:00
if ( have_fpx_regs ) {
struct user_fxsr_struct fpx ;
2005-04-17 02:20:36 +04:00
2008-10-19 07:27:26 +04:00
err = copy_from_user ( & fpx ,
& ( ( struct _fpstate __user * ) sc . fpstate ) - > _fxsr_env [ 0 ] ,
2007-10-16 12:27:15 +04:00
sizeof ( struct user_fxsr_struct ) ) ;
if ( err )
return 1 ;
2015-11-29 23:13:50 +03:00
err = convert_fxsr_from_user ( & fpx , ( void * ) sc . fpstate ) ;
2007-10-16 12:27:15 +04:00
if ( err )
return 1 ;
2008-02-05 09:30:54 +03:00
err = restore_fpx_registers ( pid , ( unsigned long * ) & fpx ) ;
2007-10-16 12:27:15 +04:00
if ( err < 0 ) {
printk ( KERN_ERR " copy_sc_from_user - "
" restore_fpx_registers failed, errno = %d \n " ,
- err ) ;
return 1 ;
}
2011-08-18 23:10:39 +04:00
} else
# endif
{
2016-03-19 19:58:39 +03:00
err = copy_from_user ( regs - > regs . fp , ( void * ) sc . fpstate ,
2016-03-19 19:58:40 +03:00
sizeof ( struct _xstate ) ) ;
2007-10-16 12:27:15 +04:00
if ( err )
return 1 ;
2005-04-17 02:20:36 +04:00
}
2007-05-07 01:51:24 +04:00
return 0 ;
2005-04-17 02:20:36 +04:00
}
2007-10-16 12:26:58 +04:00
static int copy_sc_to_user ( struct sigcontext __user * to ,
2016-03-19 19:58:40 +03:00
struct _xstate __user * to_fp , struct pt_regs * regs ,
2011-08-18 23:10:39 +04:00
unsigned long mask )
2005-04-17 02:20:36 +04:00
{
2007-10-16 12:27:00 +04:00
struct sigcontext sc ;
[PATCH] uml: S390 preparation, abstract host page fault data
This patch removes the arch-specific fault/trap-infos from thread and
skas-regs.
It adds a new struct faultinfo, that is arch-specific defined in
sysdep/faultinfo.h.
The structure is inserted in thread.arch and thread.regs.skas and
thread.regs.tt
Now, segv and other trap-handlers can copy the contents from regs.X.faultinfo
to thread.arch.faultinfo with one simple assignment.
Also, the number of macros necessary is reduced to
FAULT_ADDRESS(struct faultinfo)
extracts the faulting address from faultinfo
FAULT_WRITE(struct faultinfo)
extracts the "is_write" flag
SEGV_IS_FIXABLE(struct faultinfo)
is true for the fixable segvs, i.e. (TRAP == 14)
on i386
UPT_FAULTINFO(regs)
result is (struct faultinfo *) to the faultinfo
in regs->skas.faultinfo
GET_FAULTINFO_FROM_SC(struct faultinfo, struct sigcontext *)
copies the relevant parts of the sigcontext to
struct faultinfo.
On SIGSEGV, call user_signal() instead of handle_segv(), if the architecture
provides the information needed in PTRACE_FAULTINFO, or if PTRACE_FAULTINFO is
missing, because segv-stub will provide the info.
The benefit of the change is, that in case of a non-fixable SIGSEGV, we can
give user processes a SIGSEGV, instead of possibly looping on pagefault
handling.
Since handle_segv() sikked arch_fixup() implicitly by passing ip==0 to segv(),
I changed segv() to call arch_fixup() only, if !is_user.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-06 03:15:31 +04:00
struct faultinfo * fi = & current - > thread . arch . faultinfo ;
2008-02-05 09:30:54 +03:00
int err , pid ;
2011-08-18 23:00:49 +04:00
memset ( & sc , 0 , sizeof ( struct sigcontext ) ) ;
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:39 +04:00
# define PUTREG(regno, regname) sc.regname = regs->regs.gp[HOST_##regno]
# ifdef CONFIG_X86_32
PUTREG ( GS , gs ) ;
PUTREG ( FS , fs ) ;
PUTREG ( ES , es ) ;
PUTREG ( DS , ds ) ;
# endif
PUTREG ( DI , di ) ;
PUTREG ( SI , si ) ;
PUTREG ( BP , bp ) ;
PUTREG ( SP , sp ) ;
PUTREG ( BX , bx ) ;
PUTREG ( DX , dx ) ;
PUTREG ( CX , cx ) ;
PUTREG ( AX , ax ) ;
# ifdef CONFIG_X86_64
PUTREG ( R8 , r8 ) ;
PUTREG ( R9 , r9 ) ;
PUTREG ( R10 , r10 ) ;
PUTREG ( R11 , r11 ) ;
PUTREG ( R12 , r12 ) ;
PUTREG ( R13 , r13 ) ;
PUTREG ( R14 , r14 ) ;
PUTREG ( R15 , r15 ) ;
# endif
2007-10-16 12:27:00 +04:00
sc . cr2 = fi - > cr2 ;
sc . err = fi - > error_code ;
sc . trapno = fi - > trap_no ;
2011-08-18 23:10:39 +04:00
PUTREG ( IP , ip ) ;
PUTREG ( CS , cs ) ;
PUTREG ( EFLAGS , flags ) ;
# ifdef CONFIG_X86_32
PUTREG ( SP , sp_at_signal ) ;
PUTREG ( SS , ss ) ;
# endif
# undef PUTREG
sc . oldmask = mask ;
2015-11-29 23:13:50 +03:00
sc . fpstate = ( unsigned long ) to_fp ;
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:39 +04:00
err = copy_to_user ( to , & sc , sizeof ( struct sigcontext ) ) ;
if ( err )
return 1 ;
2008-02-05 09:30:54 +03:00
pid = userspace_pid [ current_thread_info ( ) - > cpu ] ;
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_32
2007-10-16 12:27:15 +04:00
if ( have_fpx_regs ) {
struct user_fxsr_struct fpx ;
2008-02-05 09:30:54 +03:00
err = save_fpx_registers ( pid , ( unsigned long * ) & fpx ) ;
2007-10-16 12:27:15 +04:00
if ( err < 0 ) {
printk ( KERN_ERR " copy_sc_to_user - save_fpx_registers "
" failed, errno = %d \n " , err ) ;
return 1 ;
}
2016-03-19 19:58:40 +03:00
err = convert_fxsr_to_user ( & to_fp - > fpstate , & fpx ) ;
2007-10-16 12:27:15 +04:00
if ( err )
return 1 ;
2016-03-19 19:58:40 +03:00
err | = __put_user ( fpx . swd , & to_fp - > fpstate . status ) ;
err | = __put_user ( X86_FXSR_MAGIC , & to_fp - > fpstate . magic ) ;
2007-10-16 12:27:15 +04:00
if ( err )
return 1 ;
2016-03-19 19:58:40 +03:00
if ( copy_to_user ( & to_fp - > fpstate . _fxsr_env [ 0 ] , & fpx ,
2007-10-16 12:27:15 +04:00
sizeof ( struct user_fxsr_struct ) ) )
return 1 ;
2011-08-18 23:10:39 +04:00
} else
# endif
{
2016-03-19 19:58:40 +03:00
if ( copy_to_user ( to_fp , regs - > regs . fp , sizeof ( struct _xstate ) ) )
2007-10-16 12:27:15 +04:00
return 1 ;
}
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:39 +04:00
return 0 ;
2005-04-17 02:20:36 +04:00
}
2011-08-18 23:10:39 +04:00
# ifdef CONFIG_X86_32
2007-10-16 12:27:00 +04:00
static int copy_ucontext_to_user ( struct ucontext __user * uc ,
2016-03-19 19:58:40 +03:00
struct _xstate __user * fp , sigset_t * set ,
2007-10-16 12:27:00 +04:00
unsigned long sp )
2005-04-17 02:20:36 +04:00
{
int err = 0 ;
2012-11-20 23:24:26 +04:00
err | = __save_altstack ( & uc - > uc_stack , sp ) ;
2011-08-18 23:10:39 +04:00
err | = copy_sc_to_user ( & uc - > uc_mcontext , fp , & current - > thread . regs , 0 ) ;
2005-04-17 02:20:36 +04:00
err | = copy_to_user ( & uc - > uc_sigmask , set , sizeof ( * set ) ) ;
2007-05-07 01:51:24 +04:00
return err ;
2005-04-17 02:20:36 +04:00
}
struct sigframe
{
2006-03-31 14:30:15 +04:00
char __user * pretcode ;
2005-04-17 02:20:36 +04:00
int sig ;
struct sigcontext sc ;
2016-03-19 19:58:40 +03:00
struct _xstate fpstate ;
2005-04-17 02:20:36 +04:00
unsigned long extramask [ _NSIG_WORDS - 1 ] ;
char retcode [ 8 ] ;
} ;
struct rt_sigframe
{
2006-03-31 14:30:15 +04:00
char __user * pretcode ;
2005-04-17 02:20:36 +04:00
int sig ;
2006-03-31 14:30:15 +04:00
struct siginfo __user * pinfo ;
void __user * puc ;
2005-04-17 02:20:36 +04:00
struct siginfo info ;
struct ucontext uc ;
2016-03-19 19:58:40 +03:00
struct _xstate fpstate ;
2005-04-17 02:20:36 +04:00
char retcode [ 8 ] ;
} ;
2013-10-06 23:57:10 +04:00
int setup_signal_stack_sc ( unsigned long stack_top , struct ksignal * ksig ,
struct pt_regs * regs , sigset_t * mask )
2005-04-17 02:20:36 +04:00
{
struct sigframe __user * frame ;
2006-03-31 14:30:15 +04:00
void __user * restorer ;
2013-10-06 23:57:10 +04:00
int err = 0 , sig = ksig - > sig ;
2005-04-17 02:20:36 +04:00
2007-01-31 01:36:17 +03:00
/* This is the same calculation as i386 - ((sp + 4) & 15) == 0 */
stack_top = ( ( stack_top + 4 ) & - 16UL ) - 4 ;
2006-03-31 14:30:15 +04:00
frame = ( struct sigframe __user * ) stack_top - 1 ;
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 05:57:57 +03:00
if ( ! access_ok ( frame , sizeof ( * frame ) ) )
2005-04-17 02:20:36 +04:00
return 1 ;
2006-03-31 14:30:15 +04:00
restorer = frame - > retcode ;
2013-10-06 23:57:10 +04:00
if ( ksig - > ka . sa . sa_flags & SA_RESTORER )
restorer = ksig - > ka . sa . sa_restorer ;
2005-04-17 02:20:36 +04:00
err | = __put_user ( restorer , & frame - > pretcode ) ;
err | = __put_user ( sig , & frame - > sig ) ;
2011-08-18 23:10:39 +04:00
err | = copy_sc_to_user ( & frame - > sc , & frame - > fpstate , regs , mask - > sig [ 0 ] ) ;
2005-04-17 02:20:36 +04:00
if ( _NSIG_WORDS > 1 )
err | = __copy_to_user ( & frame - > extramask , & mask - > sig [ 1 ] ,
sizeof ( frame - > extramask ) ) ;
/*
* This is popl % eax ; movl $ , % eax ; int $ 0x80
*
* WE DO NOT USE IT ANY MORE ! It ' s only left here for historical
* 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 ) ) ;
2007-10-16 12:27:00 +04:00
if ( err )
2011-08-18 23:10:29 +04:00
return err ;
2005-04-17 02:20:36 +04:00
PT_REGS_SP ( regs ) = ( unsigned long ) frame ;
2013-10-06 23:57:10 +04:00
PT_REGS_IP ( regs ) = ( unsigned long ) ksig - > ka . sa . sa_handler ;
2012-05-20 08:05:58 +04:00
PT_REGS_AX ( regs ) = ( unsigned long ) sig ;
PT_REGS_DX ( regs ) = ( unsigned long ) 0 ;
PT_REGS_CX ( regs ) = ( unsigned long ) 0 ;
2006-03-27 13:14:38 +04:00
return 0 ;
2005-04-17 02:20:36 +04:00
}
2013-10-06 23:57:10 +04:00
int setup_signal_stack_si ( unsigned long stack_top , struct ksignal * ksig ,
struct pt_regs * regs , sigset_t * mask )
2005-04-17 02:20:36 +04:00
{
struct rt_sigframe __user * frame ;
2006-03-31 14:30:15 +04:00
void __user * restorer ;
2013-10-06 23:57:10 +04:00
int err = 0 , sig = ksig - > sig ;
2005-04-17 02:20:36 +04:00
stack_top & = - 8UL ;
2006-03-31 14:30:15 +04:00
frame = ( struct rt_sigframe __user * ) stack_top - 1 ;
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 05:57:57 +03:00
if ( ! access_ok ( frame , sizeof ( * frame ) ) )
2005-04-17 02:20:36 +04:00
return 1 ;
2006-03-31 14:30:15 +04:00
restorer = frame - > retcode ;
2013-10-06 23:57:10 +04:00
if ( ksig - > ka . sa . sa_flags & SA_RESTORER )
restorer = ksig - > ka . sa . sa_restorer ;
2005-04-17 02:20:36 +04:00
err | = __put_user ( restorer , & frame - > pretcode ) ;
err | = __put_user ( sig , & frame - > sig ) ;
err | = __put_user ( & frame - > info , & frame - > pinfo ) ;
err | = __put_user ( & frame - > uc , & frame - > puc ) ;
2013-10-06 23:57:10 +04:00
err | = copy_siginfo_to_user ( & frame - > info , & ksig - > info ) ;
2005-04-17 02:20:36 +04:00
err | = copy_ucontext_to_user ( & frame - > uc , & frame - > fpstate , mask ,
2011-08-18 23:10:29 +04:00
PT_REGS_SP ( regs ) ) ;
2005-04-17 02:20:36 +04:00
/*
* This is movl $ , % eax ; int $ 0x80
*
* WE DO NOT USE IT ANY MORE ! It ' s only left here for historical
* 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 ) ) ;
2007-10-16 12:27:00 +04:00
if ( err )
2011-08-18 23:10:29 +04:00
return err ;
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:29 +04:00
PT_REGS_SP ( regs ) = ( unsigned long ) frame ;
2013-10-06 23:57:10 +04:00
PT_REGS_IP ( regs ) = ( unsigned long ) ksig - > ka . sa . sa_handler ;
2012-05-20 08:05:58 +04:00
PT_REGS_AX ( regs ) = ( unsigned long ) sig ;
PT_REGS_DX ( regs ) = ( unsigned long ) & frame - > info ;
PT_REGS_CX ( regs ) = ( unsigned long ) & frame - > uc ;
2006-03-27 13:14:38 +04:00
return 0 ;
2005-04-17 02:20:36 +04:00
}
2012-11-12 23:32:42 +04:00
long sys_sigreturn ( void )
2005-04-17 02:20:36 +04:00
{
unsigned long sp = PT_REGS_SP ( & current - > thread . regs ) ;
2006-03-31 14:30:15 +04:00
struct sigframe __user * frame = ( struct sigframe __user * ) ( sp - 8 ) ;
2005-04-17 02:20:36 +04:00
sigset_t set ;
struct sigcontext __user * sc = & frame - > sc ;
int sig_size = ( _NSIG_WORDS - 1 ) * sizeof ( unsigned long ) ;
2015-12-22 23:44:01 +03:00
if ( copy_from_user ( & set . sig [ 0 ] , & sc - > oldmask , sizeof ( set . sig [ 0 ] ) ) | |
2015-11-29 23:13:50 +03:00
copy_from_user ( & set . sig [ 1 ] , frame - > extramask , sig_size ) )
2005-04-17 02:20:36 +04:00
goto segfault ;
2011-08-18 23:00:19 +04:00
set_current_blocked ( & set ) ;
2005-04-17 02:20:36 +04:00
2007-10-16 12:27:00 +04:00
if ( copy_sc_from_user ( & current - > thread . regs , sc ) )
2005-04-17 02:20:36 +04:00
goto segfault ;
/* Avoid ERESTART handling */
PT_REGS_SYSCALL_NR ( & current - > thread . regs ) = - 1 ;
2007-05-07 01:51:24 +04:00
return PT_REGS_SYSCALL_RET ( & current - > thread . regs ) ;
2005-04-17 02:20:36 +04:00
segfault :
2019-05-23 18:17:27 +03:00
force_sig ( SIGSEGV ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
2011-08-18 23:10:39 +04:00
# else
struct rt_sigframe
{
char __user * pretcode ;
struct ucontext uc ;
struct siginfo info ;
2016-03-19 19:58:40 +03:00
struct _xstate fpstate ;
2011-08-18 23:10:39 +04:00
} ;
2013-10-06 23:57:10 +04:00
int setup_signal_stack_si ( unsigned long stack_top , struct ksignal * ksig ,
struct pt_regs * regs , sigset_t * set )
2011-08-18 23:10:39 +04:00
{
struct rt_sigframe __user * frame ;
2013-10-06 23:57:10 +04:00
int err = 0 , sig = ksig - > sig ;
2015-11-29 23:13:50 +03:00
unsigned long fp_to ;
2011-08-18 23:10:39 +04:00
frame = ( struct rt_sigframe __user * )
round_down ( stack_top - sizeof ( struct rt_sigframe ) , 16 ) ;
/* Subtract 128 for a red zone and 8 for proper alignment */
frame = ( struct rt_sigframe __user * ) ( ( unsigned long ) frame - 128 - 8 ) ;
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 05:57:57 +03:00
if ( ! access_ok ( frame , sizeof ( * frame ) ) )
2011-08-18 23:10:39 +04:00
goto out ;
2013-10-06 23:57:10 +04:00
if ( ksig - > ka . sa . sa_flags & SA_SIGINFO ) {
err | = copy_siginfo_to_user ( & frame - > info , & ksig - > info ) ;
2011-08-18 23:10:39 +04:00
if ( err )
goto out ;
}
/* Create the ucontext. */
err | = __put_user ( 0 , & frame - > uc . uc_flags ) ;
err | = __put_user ( 0 , & frame - > uc . uc_link ) ;
2012-11-20 23:24:26 +04:00
err | = __save_altstack ( & frame - > uc . uc_stack , PT_REGS_SP ( regs ) ) ;
2011-08-18 23:10:39 +04:00
err | = copy_sc_to_user ( & frame - > uc . uc_mcontext , & frame - > fpstate , regs ,
set - > sig [ 0 ] ) ;
2015-11-29 23:13:50 +03:00
fp_to = ( unsigned long ) & frame - > fpstate ;
err | = __put_user ( fp_to , & frame - > uc . uc_mcontext . fpstate ) ;
2011-08-18 23:10:39 +04:00
if ( sizeof ( * set ) = = 16 ) {
2012-04-23 00:34:27 +04:00
err | = __put_user ( set - > sig [ 0 ] , & frame - > uc . uc_sigmask . sig [ 0 ] ) ;
err | = __put_user ( set - > sig [ 1 ] , & frame - > uc . uc_sigmask . sig [ 1 ] ) ;
2011-08-18 23:10:39 +04:00
}
else
err | = __copy_to_user ( & frame - > uc . uc_sigmask , set ,
sizeof ( * set ) ) ;
/*
* Set up to return from userspace . If provided , use a stub
* already in userspace .
*/
/* x86-64 should always use SA_RESTORER. */
2013-10-06 23:57:10 +04:00
if ( ksig - > ka . sa . sa_flags & SA_RESTORER )
2015-05-14 00:02:14 +03:00
err | = __put_user ( ( void * ) ksig - > ka . sa . sa_restorer ,
& frame - > pretcode ) ;
2011-08-18 23:10:39 +04:00
else
/* could use a vstub here */
return err ;
if ( err )
return err ;
PT_REGS_SP ( regs ) = ( unsigned long ) frame ;
2012-05-20 08:05:58 +04:00
PT_REGS_DI ( regs ) = sig ;
2011-08-18 23:10:39 +04:00
/* In case the signal handler was declared without prototypes */
2012-05-20 08:05:58 +04:00
PT_REGS_AX ( regs ) = 0 ;
2011-08-18 23:10:39 +04:00
/*
* This also works for non SA_SIGINFO handlers because they expect the
* next argument after the signal number on the stack .
*/
2012-05-20 08:05:58 +04:00
PT_REGS_SI ( regs ) = ( unsigned long ) & frame - > info ;
PT_REGS_DX ( regs ) = ( unsigned long ) & frame - > uc ;
2013-10-06 23:57:10 +04:00
PT_REGS_IP ( regs ) = ( unsigned long ) ksig - > ka . sa . sa_handler ;
2011-08-18 23:10:39 +04:00
out :
return err ;
}
# endif
2012-11-12 23:32:42 +04:00
long sys_rt_sigreturn ( void )
2005-04-17 02:20:36 +04:00
{
2006-03-31 14:30:15 +04:00
unsigned long sp = PT_REGS_SP ( & current - > thread . regs ) ;
2007-10-16 12:27:00 +04:00
struct rt_sigframe __user * frame =
2011-08-18 23:10:39 +04:00
( struct rt_sigframe __user * ) ( sp - sizeof ( long ) ) ;
2005-04-17 02:20:36 +04:00
struct ucontext __user * uc = & frame - > uc ;
2011-08-18 23:10:39 +04:00
sigset_t set ;
2005-04-17 02:20:36 +04:00
2011-08-18 23:10:39 +04:00
if ( copy_from_user ( & set , & uc - > uc_sigmask , sizeof ( set ) ) )
2005-04-17 02:20:36 +04:00
goto segfault ;
2011-08-18 23:00:19 +04:00
set_current_blocked ( & set ) ;
2005-04-17 02:20:36 +04:00
2007-10-16 12:27:00 +04:00
if ( copy_sc_from_user ( & current - > thread . regs , & uc - > uc_mcontext ) )
2005-04-17 02:20:36 +04:00
goto segfault ;
/* Avoid ERESTART handling */
PT_REGS_SYSCALL_NR ( & current - > thread . regs ) = - 1 ;
2007-05-07 01:51:24 +04:00
return PT_REGS_SYSCALL_RET ( & current - > thread . regs ) ;
2005-04-17 02:20:36 +04:00
segfault :
2019-05-23 18:17:27 +03:00
force_sig ( SIGSEGV ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}