2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* linux/arch/m32r/kernel/signal.c
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003 Hitoshi Yamamoto
|
|
|
|
*
|
|
|
|
* Taken from i386 version.
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
|
|
|
|
* 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/signal.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/personality.h>
|
2006-12-06 21:34:23 -07:00
|
|
|
#include <linux/freezer.h>
|
2009-09-09 01:30:21 -06:00
|
|
|
#include <linux/tracehook.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <asm/cacheflush.h>
|
|
|
|
#include <asm/ucontext.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
|
|
#define DEBUG_SIG 0
|
|
|
|
|
2010-10-15 19:16:45 -06:00
|
|
|
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
asmlinkage int
|
|
|
|
sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
|
|
|
|
unsigned long r2, unsigned long r3, unsigned long r4,
|
2006-02-24 14:03:51 -07:00
|
|
|
unsigned long r5, unsigned long r6, struct pt_regs *regs)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2006-02-24 14:03:51 -07:00
|
|
|
return do_sigaltstack(uss, uoss, regs->spu);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do a signal return; undo the signal stack.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct rt_sigframe
|
|
|
|
{
|
|
|
|
int sig;
|
2006-10-11 10:24:45 -06:00
|
|
|
struct siginfo __user *pinfo;
|
|
|
|
void __user *puc;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct siginfo info;
|
|
|
|
struct ucontext uc;
|
|
|
|
// struct _fpstate fpstate;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
|
|
|
|
int *r0_p)
|
|
|
|
{
|
|
|
|
unsigned int err = 0;
|
|
|
|
|
|
|
|
/* 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->sc_##x)
|
|
|
|
COPY(r4);
|
|
|
|
COPY(r5);
|
|
|
|
COPY(r6);
|
|
|
|
COPY(pt_regs);
|
|
|
|
/* COPY(r0); Skip r0 */
|
|
|
|
COPY(r1);
|
|
|
|
COPY(r2);
|
|
|
|
COPY(r3);
|
|
|
|
COPY(r7);
|
|
|
|
COPY(r8);
|
|
|
|
COPY(r9);
|
|
|
|
COPY(r10);
|
|
|
|
COPY(r11);
|
|
|
|
COPY(r12);
|
|
|
|
COPY(acc0h);
|
|
|
|
COPY(acc0l);
|
2007-02-10 02:43:35 -07:00
|
|
|
COPY(acc1h); /* ISA_DSP_LEVEL2 only */
|
|
|
|
COPY(acc1l); /* ISA_DSP_LEVEL2 only */
|
2005-04-16 16:20:36 -06:00
|
|
|
COPY(psw);
|
|
|
|
COPY(bpc);
|
|
|
|
COPY(bbpsw);
|
|
|
|
COPY(bbpc);
|
|
|
|
COPY(spu);
|
|
|
|
COPY(fp);
|
|
|
|
COPY(lr);
|
|
|
|
COPY(spi);
|
|
|
|
#undef COPY
|
|
|
|
|
|
|
|
regs->syscall_nr = -1; /* disable syscall checks */
|
|
|
|
err |= __get_user(*r0_p, &sc->sc_r0);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage int
|
|
|
|
sys_rt_sigreturn(unsigned long r0, unsigned long r1,
|
|
|
|
unsigned long r2, unsigned long r3, unsigned long r4,
|
2006-02-24 14:03:51 -07:00
|
|
|
unsigned long r5, unsigned long r6, struct pt_regs *regs)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2006-02-24 14:03:51 -07:00
|
|
|
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->spu;
|
2005-04-16 16:20:36 -06:00
|
|
|
sigset_t set;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
|
|
|
|
goto badframe;
|
|
|
|
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
|
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
current->blocked = set;
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
2006-02-24 14:03:51 -07:00
|
|
|
if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &result))
|
2005-04-16 16:20:36 -06:00
|
|
|
goto badframe;
|
|
|
|
|
2006-02-24 14:03:51 -07:00
|
|
|
if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->spu) == -EFAULT)
|
2005-04-16 16:20:36 -06:00
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
badframe:
|
|
|
|
force_sig(SIGSEGV, current);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up a signal frame.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
|
|
|
|
unsigned long mask)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
#define COPY(x) err |= __put_user(regs->x, &sc->sc_##x)
|
|
|
|
COPY(r4);
|
|
|
|
COPY(r5);
|
|
|
|
COPY(r6);
|
|
|
|
COPY(pt_regs);
|
|
|
|
COPY(r0);
|
|
|
|
COPY(r1);
|
|
|
|
COPY(r2);
|
|
|
|
COPY(r3);
|
|
|
|
COPY(r7);
|
|
|
|
COPY(r8);
|
|
|
|
COPY(r9);
|
|
|
|
COPY(r10);
|
|
|
|
COPY(r11);
|
|
|
|
COPY(r12);
|
|
|
|
COPY(acc0h);
|
|
|
|
COPY(acc0l);
|
2007-02-10 02:43:35 -07:00
|
|
|
COPY(acc1h); /* ISA_DSP_LEVEL2 only */
|
|
|
|
COPY(acc1l); /* ISA_DSP_LEVEL2 only */
|
2005-04-16 16:20:36 -06:00
|
|
|
COPY(psw);
|
|
|
|
COPY(bpc);
|
|
|
|
COPY(bbpsw);
|
|
|
|
COPY(bbpc);
|
|
|
|
COPY(spu);
|
|
|
|
COPY(fp);
|
|
|
|
COPY(lr);
|
|
|
|
COPY(spi);
|
|
|
|
#undef COPY
|
|
|
|
|
|
|
|
err |= __put_user(mask, &sc->oldmask);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine which stack to use..
|
|
|
|
*/
|
|
|
|
static inline void __user *
|
|
|
|
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
|
|
|
|
{
|
|
|
|
/* This is the X/Open sanctioned signal stack switching. */
|
|
|
|
if (ka->sa.sa_flags & SA_ONSTACK) {
|
|
|
|
if (sas_ss_flags(sp) == 0)
|
|
|
|
sp = current->sas_ss_sp + current->sas_ss_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (void __user *)((sp - frame_size) & -8ul);
|
|
|
|
}
|
|
|
|
|
2010-09-23 23:23:57 -06:00
|
|
|
static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
2005-04-16 16:20:36 -06:00
|
|
|
sigset_t *set, struct pt_regs *regs)
|
|
|
|
{
|
|
|
|
struct rt_sigframe __user *frame;
|
|
|
|
int err = 0;
|
|
|
|
int signal;
|
|
|
|
|
|
|
|
frame = get_sigframe(ka, regs->spu, sizeof(*frame));
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
signal = current_thread_info()->exec_domain
|
|
|
|
&& current_thread_info()->exec_domain->signal_invmap
|
|
|
|
&& sig < 32
|
|
|
|
? current_thread_info()->exec_domain->signal_invmap[sig]
|
|
|
|
: sig;
|
|
|
|
|
|
|
|
err |= __put_user(signal, &frame->sig);
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
err |= __put_user(&frame->info, &frame->pinfo);
|
|
|
|
err |= __put_user(&frame->uc, &frame->puc);
|
|
|
|
err |= copy_siginfo_to_user(&frame->info, info);
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Create the ucontext. */
|
|
|
|
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->spu),
|
|
|
|
&frame->uc.uc_stack.ss_flags);
|
|
|
|
err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
|
|
|
|
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0]);
|
|
|
|
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Set up to return from userspace. */
|
|
|
|
regs->lr = (unsigned long)ka->sa.sa_restorer;
|
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
|
|
|
regs->spu = (unsigned long)frame;
|
|
|
|
regs->r0 = signal; /* Arg for signal handler */
|
|
|
|
regs->r1 = (unsigned long)&frame->info;
|
|
|
|
regs->r2 = (unsigned long)&frame->uc;
|
|
|
|
regs->bpc = (unsigned long)ka->sa.sa_handler;
|
|
|
|
|
|
|
|
set_fs(USER_DS);
|
|
|
|
|
|
|
|
#if DEBUG_SIG
|
|
|
|
printk("SIG deliver (%s:%d): sp=%p pc=%p\n",
|
|
|
|
current->comm, current->pid, frame, regs->pc);
|
|
|
|
#endif
|
|
|
|
|
2010-09-23 23:23:57 -06:00
|
|
|
return 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
give_sigsegv:
|
|
|
|
force_sigsegv(sig, current);
|
2010-09-23 23:23:57 -06:00
|
|
|
return -EFAULT;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2010-09-23 23:24:53 -06:00
|
|
|
static int prev_insn(struct pt_regs *regs)
|
|
|
|
{
|
|
|
|
u16 inst;
|
2010-10-15 19:17:09 -06:00
|
|
|
if (get_user(inst, (u16 __user *)(regs->bpc - 2)))
|
2010-09-23 23:24:53 -06:00
|
|
|
return -EFAULT;
|
|
|
|
if ((inst & 0xfff0) == 0x10f0) /* trap ? */
|
|
|
|
regs->bpc -= 2;
|
|
|
|
else
|
|
|
|
regs->bpc -= 4;
|
|
|
|
regs->syscall_nr = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* OK, we're invoking a handler
|
|
|
|
*/
|
|
|
|
|
2010-09-23 23:23:57 -06:00
|
|
|
static int
|
2005-04-16 16:20:36 -06:00
|
|
|
handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
|
sigset_t *oldset, struct pt_regs *regs)
|
|
|
|
{
|
|
|
|
/* Are we from a system call? */
|
|
|
|
if (regs->syscall_nr >= 0) {
|
|
|
|
/* If so, check system call restarting.. */
|
|
|
|
switch (regs->r0) {
|
|
|
|
case -ERESTART_RESTARTBLOCK:
|
|
|
|
case -ERESTARTNOHAND:
|
|
|
|
regs->r0 = -EINTR;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case -ERESTARTSYS:
|
|
|
|
if (!(ka->sa.sa_flags & SA_RESTART)) {
|
|
|
|
regs->r0 = -EINTR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fallthrough */
|
|
|
|
case -ERESTARTNOINTR:
|
|
|
|
regs->r0 = regs->orig_r0;
|
2010-09-23 23:24:53 -06:00
|
|
|
if (prev_insn(regs) < 0)
|
|
|
|
return -EFAULT;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up the stack frame */
|
2010-09-23 23:23:57 -06:00
|
|
|
if (setup_rt_frame(sig, ka, info, oldset, regs))
|
|
|
|
return -EFAULT;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
[PATCH] convert signal handling of NODEFER to act like other Unix boxes.
It has been reported that the way Linux handles NODEFER for signals is
not consistent with the way other Unix boxes handle it. I've written a
program to test the behavior of how this flag affects signals and had
several reports from people who ran this on various Unix boxes,
confirming that Linux seems to be unique on the way this is handled.
The way NODEFER affects signals on other Unix boxes is as follows:
1) If NODEFER is set, other signals in sa_mask are still blocked.
2) If NODEFER is set and the signal is in sa_mask, then the signal is
still blocked. (Note: this is the behavior of all tested but Linux _and_
NetBSD 2.0 *).
The way NODEFER affects signals on Linux:
1) If NODEFER is set, other signals are _not_ blocked regardless of
sa_mask (Even NetBSD doesn't do this).
2) If NODEFER is set and the signal is in sa_mask, then the signal being
handled is not blocked.
The patch converts signal handling in all current Linux architectures to
the way most Unix boxes work.
Unix boxes that were tested: DU4, AIX 5.2, Irix 6.5, NetBSD 2.0, SFU
3.5 on WinXP, AIX 5.3, Mac OSX, and of course Linux 2.6.13-rcX.
* NetBSD was the only other Unix to behave like Linux on point #2. The
main concern was brought up by point #1 which even NetBSD isn't like
Linux. So with this patch, we leave NetBSD as the lonely one that
behaves differently here with #2.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-29 09:44:09 -06:00
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask);
|
|
|
|
if (!(ka->sa.sa_flags & SA_NODEFER))
|
2005-04-16 16:20:36 -06:00
|
|
|
sigaddset(¤t->blocked,sig);
|
[PATCH] convert signal handling of NODEFER to act like other Unix boxes.
It has been reported that the way Linux handles NODEFER for signals is
not consistent with the way other Unix boxes handle it. I've written a
program to test the behavior of how this flag affects signals and had
several reports from people who ran this on various Unix boxes,
confirming that Linux seems to be unique on the way this is handled.
The way NODEFER affects signals on other Unix boxes is as follows:
1) If NODEFER is set, other signals in sa_mask are still blocked.
2) If NODEFER is set and the signal is in sa_mask, then the signal is
still blocked. (Note: this is the behavior of all tested but Linux _and_
NetBSD 2.0 *).
The way NODEFER affects signals on Linux:
1) If NODEFER is set, other signals are _not_ blocked regardless of
sa_mask (Even NetBSD doesn't do this).
2) If NODEFER is set and the signal is in sa_mask, then the signal being
handled is not blocked.
The patch converts signal handling in all current Linux architectures to
the way most Unix boxes work.
Unix boxes that were tested: DU4, AIX 5.2, Irix 6.5, NetBSD 2.0, SFU
3.5 on WinXP, AIX 5.3, Mac OSX, and of course Linux 2.6.13-rcX.
* NetBSD was the only other Unix to behave like Linux on point #2. The
main concern was brought up by point #1 which even NetBSD isn't like
Linux. So with this patch, we leave NetBSD as the lonely one that
behaves differently here with #2.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-29 09:44:09 -06:00
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
2010-09-23 23:23:57 -06:00
|
|
|
return 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note that 'init' is a special process: it doesn't get signals it doesn't
|
|
|
|
* want to handle. Thus you cannot kill init even with a SIGKILL even by
|
|
|
|
* mistake.
|
|
|
|
*/
|
2010-09-23 23:23:57 -06:00
|
|
|
static void do_signal(struct pt_regs *regs)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
int signr;
|
|
|
|
struct k_sigaction ka;
|
2010-09-23 23:20:35 -06:00
|
|
|
sigset_t *oldset;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We want the common case to go fast, which
|
|
|
|
* is why we may in certain cases get here from
|
|
|
|
* kernel mode. Just return without doing anything
|
|
|
|
* if so.
|
|
|
|
*/
|
|
|
|
if (!user_mode(regs))
|
2010-09-23 23:23:57 -06:00
|
|
|
return;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-06-25 00:13:50 -06:00
|
|
|
if (try_to_freeze())
|
2005-04-16 16:20:36 -06:00
|
|
|
goto no_signal;
|
|
|
|
|
2010-09-23 23:20:35 -06:00
|
|
|
if (test_thread_flag(TIF_RESTORE_SIGMASK))
|
|
|
|
oldset = ¤t->saved_sigmask;
|
|
|
|
else
|
2005-04-16 16:20:36 -06:00
|
|
|
oldset = ¤t->blocked;
|
|
|
|
|
|
|
|
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
|
|
|
if (signr > 0) {
|
2007-10-19 17:14:39 -06:00
|
|
|
/* Re-enable any watchpoints before delivering the
|
2005-04-16 16:20:36 -06:00
|
|
|
* signal to user space. The processor register will
|
|
|
|
* have been cleared if the watchpoint triggered
|
|
|
|
* inside the kernel.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Whee! Actually deliver the signal. */
|
2010-09-23 23:23:57 -06:00
|
|
|
if (handle_signal(signr, &ka, &info, oldset, regs) == 0)
|
|
|
|
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
|
|
|
|
|
|
|
return;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
no_signal:
|
|
|
|
/* Did we come from a system call? */
|
|
|
|
if (regs->syscall_nr >= 0) {
|
|
|
|
/* Restart the system call - no handlers present */
|
|
|
|
if (regs->r0 == -ERESTARTNOHAND ||
|
|
|
|
regs->r0 == -ERESTARTSYS ||
|
|
|
|
regs->r0 == -ERESTARTNOINTR) {
|
|
|
|
regs->r0 = regs->orig_r0;
|
2010-09-23 23:24:53 -06:00
|
|
|
prev_insn(regs);
|
2010-09-23 23:22:30 -06:00
|
|
|
} else if (regs->r0 == -ERESTART_RESTARTBLOCK){
|
2005-04-16 16:20:36 -06:00
|
|
|
regs->r0 = regs->orig_r0;
|
|
|
|
regs->r7 = __NR_restart_syscall;
|
2010-09-23 23:24:53 -06:00
|
|
|
prev_insn(regs);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
2010-09-23 23:20:35 -06:00
|
|
|
if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
|
|
|
|
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
|
|
|
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* notification of userspace execution resumption
|
|
|
|
* - triggered by current->work.notify_resume
|
|
|
|
*/
|
2010-09-23 23:20:35 -06:00
|
|
|
void do_notify_resume(struct pt_regs *regs, __u32 thread_info_flags)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
/* Pending single-step? */
|
|
|
|
if (thread_info_flags & _TIF_SINGLESTEP)
|
|
|
|
clear_thread_flag(TIF_SINGLESTEP);
|
|
|
|
|
|
|
|
/* deal with pending signal delivery */
|
|
|
|
if (thread_info_flags & _TIF_SIGPENDING)
|
2010-09-23 23:20:35 -06:00
|
|
|
do_signal(regs);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-09-02 02:14:16 -06:00
|
|
|
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
|
|
|
|
clear_thread_flag(TIF_NOTIFY_RESUME);
|
|
|
|
tracehook_notify_resume(regs);
|
KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]
Add a keyctl to install a process's session keyring onto its parent. This
replaces the parent's session keyring. Because the COW credential code does
not permit one process to change another process's credentials directly, the
change is deferred until userspace next starts executing again. Normally this
will be after a wait*() syscall.
To support this, three new security hooks have been provided:
cred_alloc_blank() to allocate unset security creds, cred_transfer() to fill in
the blank security creds and key_session_to_parent() - which asks the LSM if
the process may replace its parent's session keyring.
The replacement may only happen if the process has the same ownership details
as its parent, and the process has LINK permission on the session keyring, and
the session keyring is owned by the process, and the LSM permits it.
Note that this requires alteration to each architecture's notify_resume path.
This has been done for all arches barring blackfin, m68k* and xtensa, all of
which need assembly alteration to support TIF_NOTIFY_RESUME. This allows the
replacement to be performed at the point the parent process resumes userspace
execution.
This allows the userspace AFS pioctl emulation to fully emulate newpag() and
the VIOCSETTOK and VIOCSETTOK2 pioctls, all of which require the ability to
alter the parent process's PAG membership. However, since kAFS doesn't use
PAGs per se, but rather dumps the keys into the session keyring, the session
keyring of the parent must be replaced if, for example, VIOCSETTOK is passed
the newpag flag.
This can be tested with the following program:
#include <stdio.h>
#include <stdlib.h>
#include <keyutils.h>
#define KEYCTL_SESSION_TO_PARENT 18
#define OSERROR(X, S) do { if ((long)(X) == -1) { perror(S); exit(1); } } while(0)
int main(int argc, char **argv)
{
key_serial_t keyring, key;
long ret;
keyring = keyctl_join_session_keyring(argv[1]);
OSERROR(keyring, "keyctl_join_session_keyring");
key = add_key("user", "a", "b", 1, keyring);
OSERROR(key, "add_key");
ret = keyctl(KEYCTL_SESSION_TO_PARENT);
OSERROR(ret, "KEYCTL_SESSION_TO_PARENT");
return 0;
}
Compiled and linked with -lkeyutils, you should see something like:
[dhowells@andromeda ~]$ keyctl show
Session Keyring
-3 --alswrv 4043 4043 keyring: _ses
355907932 --alswrv 4043 -1 \_ keyring: _uid.4043
[dhowells@andromeda ~]$ /tmp/newpag
[dhowells@andromeda ~]$ keyctl show
Session Keyring
-3 --alswrv 4043 4043 keyring: _ses
1055658746 --alswrv 4043 4043 \_ user: a
[dhowells@andromeda ~]$ /tmp/newpag hello
[dhowells@andromeda ~]$ keyctl show
Session Keyring
-3 --alswrv 4043 4043 keyring: hello
340417692 --alswrv 4043 4043 \_ user: a
Where the test program creates a new session keyring, sticks a user key named
'a' into it and then installs it on its parent.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
2009-09-02 02:14:21 -06:00
|
|
|
if (current->replacement_session_keyring)
|
|
|
|
key_replace_session_keyring();
|
2009-09-02 02:14:16 -06:00
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
clear_thread_flag(TIF_IRET);
|
|
|
|
}
|