Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2814476 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] s390 signal annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0cc13a54

arch/s390/kernel/compat_signal.c

+3 −3
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) 
			break;

		case __SI_FAULT >> 16:

			err |= __get_user(tmp, &from->si_addr);

			to->si_addr = (void *)(u64) (tmp & PSW32_ADDR_INSN);

			to->si_addr = (void __user *)(u64) (tmp & PSW32_ADDR_INSN);

			break;

		case __SI_POLL >> 16:

			err |= __get_user(to->si_band, &from->si_band);
@@ -338,7 +338,7 @@ sys32_sigaltstack(const stack_t32 __user *uss, stack_t32 __user *uoss, 
		err |= __get_user(kss.ss_flags, &uss->ss_flags);

		if (err)

			return -EFAULT;

		kss.ss_sp = (void *) ss_sp;

		kss.ss_sp = (void __user *) ss_sp;

	}



	set_fs (KERNEL_DS);
@@ -461,7 +461,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) 
		goto badframe;



	err = __get_user(ss_sp, &frame->uc.uc_stack.ss_sp);

	st.ss_sp = (void *) A((unsigned long)ss_sp);

	st.ss_sp = compat_ptr(ss_sp);

	err |= __get_user(st.ss_size, &frame->uc.uc_stack.ss_size);

	err |= __get_user(st.ss_flags, &frame->uc.uc_stack.ss_flags);

	if (err)

arch/s390/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 


	/* Create the ucontext.  */

	err |= __put_user(0, &frame->uc.uc_flags);

	err |= __put_user(0, &frame->uc.uc_link);

	err |= __put_user((void *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);

	err |= __put_user(NULL, &frame->uc.uc_link);

	err |= __put_user((void __user *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);

	err |= __put_user(sas_ss_flags(regs->gprs[15]),

			  &frame->uc.uc_stack.ss_flags);

	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);

include/asm-s390/sigcontext.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ typedef struct 
struct sigcontext

{

	unsigned long	oldmask[_SIGCONTEXT_NSIG_WORDS];

	_sigregs        *sregs;

	_sigregs        __user *sregs;

};

include/asm-s390/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct sigaction { 
#endif /* __KERNEL__ */



typedef struct sigaltstack {

        void *ss_sp;

        void __user *ss_sp;

        int ss_flags;

        size_t ss_size;

} stack_t;