2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* linux/kernel/signal.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* 1997-11-02 Modified for POSIX.1b signals by Richard Henderson
|
|
|
|
*
|
|
|
|
* 2003-06-02 Jim Houston - Concurrent Computer Corp.
|
|
|
|
* Changes to use preallocated sigqueue structures
|
|
|
|
* to allow signals to be sent reliably.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/slab.h>
|
2011-05-24 01:51:41 +07:00
|
|
|
#include <linux/export.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/tty.h>
|
|
|
|
#include <linux/binfmts.h>
|
2012-10-05 07:15:24 +07:00
|
|
|
#include <linux/coredump.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/security.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/ptrace.h>
|
2005-05-01 22:59:14 +07:00
|
|
|
#include <linux/signal.h>
|
signal/timer/event: signalfd core
This patch series implements the new signalfd() system call.
I took part of the original Linus code (and you know how badly it can be
broken :), and I added even more breakage ;) Signals are fetched from the same
signal queue used by the process, so signalfd will compete with standard
kernel delivery in dequeue_signal(). If you want to reliably fetch signals on
the signalfd file, you need to block them with sigprocmask(SIG_BLOCK). This
seems to be working fine on my Dual Opteron machine. I made a quick test
program for it:
http://www.xmailserver.org/signafd-test.c
The signalfd() system call implements signal delivery into a file descriptor
receiver. The signalfd file descriptor if created with the following API:
int signalfd(int ufd, const sigset_t *mask, size_t masksize);
The "ufd" parameter allows to change an existing signalfd sigmask, w/out going
to close/create cycle (Linus idea). Use "ufd" == -1 if you want a brand new
signalfd file.
The "mask" allows to specify the signal mask of signals that we are interested
in. The "masksize" parameter is the size of "mask".
The signalfd fd supports the poll(2) and read(2) system calls. The poll(2)
will return POLLIN when signals are available to be dequeued. As a direct
consequence of supporting the Linux poll subsystem, the signalfd fd can use
used together with epoll(2) too.
The read(2) system call will return a "struct signalfd_siginfo" structure in
the userspace supplied buffer. The return value is the number of bytes copied
in the supplied buffer, or -1 in case of error. The read(2) call can also
return 0, in case the sighand structure to which the signalfd was attached,
has been orphaned. The O_NONBLOCK flag is also supported, and read(2) will
return -EAGAIN in case no signal is available.
If the size of the buffer passed to read(2) is lower than sizeof(struct
signalfd_siginfo), -EINVAL is returned. A read from the signalfd can also
return -ERESTARTSYS in case a signal hits the process. The format of the
struct signalfd_siginfo is, and the valid fields depends of the (->code &
__SI_MASK) value, in the same way a struct siginfo would:
struct signalfd_siginfo {
__u32 signo; /* si_signo */
__s32 err; /* si_errno */
__s32 code; /* si_code */
__u32 pid; /* si_pid */
__u32 uid; /* si_uid */
__s32 fd; /* si_fd */
__u32 tid; /* si_fd */
__u32 band; /* si_band */
__u32 overrun; /* si_overrun */
__u32 trapno; /* si_trapno */
__s32 status; /* si_status */
__s32 svint; /* si_int */
__u64 svptr; /* si_ptr */
__u64 utime; /* si_utime */
__u64 stime; /* si_stime */
__u64 addr; /* si_addr */
};
[akpm@linux-foundation.org: fix signalfd_copyinfo() on i386]
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-11 12:23:13 +07:00
|
|
|
#include <linux/signalfd.h>
|
2009-11-08 22:46:42 +07:00
|
|
|
#include <linux/ratelimit.h>
|
2008-07-26 09:45:51 +07:00
|
|
|
#include <linux/tracehook.h>
|
2006-01-12 03:17:46 +07:00
|
|
|
#include <linux/capability.h>
|
2006-12-07 11:34:23 +07:00
|
|
|
#include <linux/freezer.h>
|
2006-12-08 17:38:01 +07:00
|
|
|
#include <linux/pid_namespace.h>
|
|
|
|
#include <linux/nsproxy.h>
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
#include <linux/user_namespace.h>
|
uprobes/core: Handle breakpoint and singlestep exceptions
Uprobes uses exception notifiers to get to know if a thread hit
a breakpoint or a singlestep exception.
When a thread hits a uprobe or is singlestepping post a uprobe
hit, the uprobe exception notifier sets its TIF_UPROBE bit,
which will then be checked on its return to userspace path
(do_notify_resume() ->uprobe_notify_resume()), where the
consumers handlers are run (in task context) based on the
defined filters.
Uprobe hits are thread specific and hence we need to maintain
information about if a task hit a uprobe, what uprobe was hit,
the slot where the original instruction was copied for xol so
that it can be singlestepped with appropriate fixups.
In some cases, special care is needed for instructions that are
executed out of line (xol). These are architecture specific
artefacts, such as handling RIP relative instructions on x86_64.
Since the instruction at which the uprobe was inserted is
executed out of line, architecture specific fixups are added so
that the thread continues normal execution in the presence of a
uprobe.
Postpone the signals until we execute the probed insn.
post_xol() path does a recalc_sigpending() before return to
user-mode, this ensures the signal can't be lost.
Uprobes relies on DIE_DEBUG notification to notify if a
singlestep is complete.
Adds x86 specific uprobe exception notifiers and appropriate
hooks needed to determine a uprobe hit and subsequent post
processing.
Add requisite x86 fixups for xol for uprobes. Specific cases
needing fixups include relative jumps (x86_64), calls, etc.
Where possible, we check and skip singlestepping the
breakpointed instructions. For now we skip single byte as well
as few multibyte nop instructions. However this can be extended
to other instructions too.
Credits to Oleg Nesterov for suggestions/patches related to
signal, breakpoint, singlestep handling code.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com>
Cc: Linux-mm <linux-mm@kvack.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120313180011.29771.89027.sendpatchset@srdronam.in.ibm.com
[ Performed various cleanliness edits ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2012-03-14 01:00:11 +07:00
|
|
|
#include <linux/uprobes.h>
|
2012-12-15 02:47:53 +07:00
|
|
|
#include <linux/compat.h>
|
2013-03-20 03:50:05 +07:00
|
|
|
#include <linux/cn_proc.h>
|
2014-04-08 05:39:20 +07:00
|
|
|
#include <linux/compiler.h>
|
|
|
|
|
2009-11-25 04:56:45 +07:00
|
|
|
#define CREATE_TRACE_POINTS
|
|
|
|
#include <trace/events/signal.h>
|
2006-12-08 17:38:01 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <asm/param.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/unistd.h>
|
|
|
|
#include <asm/siginfo.h>
|
2012-03-29 00:30:03 +07:00
|
|
|
#include <asm/cacheflush.h>
|
2006-05-25 21:19:47 +07:00
|
|
|
#include "audit.h" /* audit_signal_info() */
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* SLAB caches for signal bits.
|
|
|
|
*/
|
|
|
|
|
2006-12-07 11:33:20 +07:00
|
|
|
static struct kmem_cache *sigqueue_cachep;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2009-11-08 22:46:42 +07:00
|
|
|
int print_fatal_signals __read_mostly;
|
|
|
|
|
2008-07-26 09:45:51 +07:00
|
|
|
static void __user *sig_handler(struct task_struct *t, int sig)
|
2008-04-30 14:52:39 +07:00
|
|
|
{
|
2008-07-26 09:45:51 +07:00
|
|
|
return t->sighand->action[sig - 1].sa.sa_handler;
|
|
|
|
}
|
2008-04-30 14:52:39 +07:00
|
|
|
|
2008-07-26 09:45:51 +07:00
|
|
|
static int sig_handler_ignored(void __user *handler, int sig)
|
|
|
|
{
|
2008-04-30 14:52:39 +07:00
|
|
|
/* Is it explicitly or implicitly ignored? */
|
|
|
|
return handler == SIG_IGN ||
|
|
|
|
(handler == SIG_DFL && sig_kernel_ignore(sig));
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-03-24 05:02:45 +07:00
|
|
|
static int sig_task_ignored(struct task_struct *t, int sig, bool force)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-07-26 09:45:51 +07:00
|
|
|
void __user *handler;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2009-04-03 06:58:02 +07:00
|
|
|
handler = sig_handler(t, sig);
|
|
|
|
|
|
|
|
if (unlikely(t->signal->flags & SIGNAL_UNKILLABLE) &&
|
2012-03-24 05:02:45 +07:00
|
|
|
handler == SIG_DFL && !force)
|
2009-04-03 06:58:02 +07:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return sig_handler_ignored(handler, sig);
|
|
|
|
}
|
|
|
|
|
2012-03-24 05:02:45 +07:00
|
|
|
static int sig_ignored(struct task_struct *t, int sig, bool force)
|
2009-04-03 06:58:02 +07:00
|
|
|
{
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Blocked signals are never ignored, since the
|
|
|
|
* signal handler may change by the time it is
|
|
|
|
* unblocked.
|
|
|
|
*/
|
2007-11-13 06:41:55 +07:00
|
|
|
if (sigismember(&t->blocked, sig) || sigismember(&t->real_blocked, sig))
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
|
2012-03-24 05:02:45 +07:00
|
|
|
if (!sig_task_ignored(t, sig, force))
|
2008-07-26 09:45:51 +07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tracers may want to know about even ignored signals.
|
|
|
|
*/
|
2011-06-17 21:50:37 +07:00
|
|
|
return !t->ptrace;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Re-calculate pending state from the set of locally pending
|
|
|
|
* signals, globally pending signals, and blocked signals.
|
|
|
|
*/
|
|
|
|
static inline int has_pending_signals(sigset_t *signal, sigset_t *blocked)
|
|
|
|
{
|
|
|
|
unsigned long ready;
|
|
|
|
long i;
|
|
|
|
|
|
|
|
switch (_NSIG_WORDS) {
|
|
|
|
default:
|
|
|
|
for (i = _NSIG_WORDS, ready = 0; --i >= 0 ;)
|
|
|
|
ready |= signal->sig[i] &~ blocked->sig[i];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4: ready = signal->sig[3] &~ blocked->sig[3];
|
|
|
|
ready |= signal->sig[2] &~ blocked->sig[2];
|
|
|
|
ready |= signal->sig[1] &~ blocked->sig[1];
|
|
|
|
ready |= signal->sig[0] &~ blocked->sig[0];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: ready = signal->sig[1] &~ blocked->sig[1];
|
|
|
|
ready |= signal->sig[0] &~ blocked->sig[0];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1: ready = signal->sig[0] &~ blocked->sig[0];
|
|
|
|
}
|
|
|
|
return ready != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define PENDING(p,b) has_pending_signals(&(p)->signal, (b))
|
|
|
|
|
2007-05-24 03:57:44 +07:00
|
|
|
static int recalc_sigpending_tsk(struct task_struct *t)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-06-02 16:14:00 +07:00
|
|
|
if ((t->jobctl & JOBCTL_PENDING_MASK) ||
|
2005-04-17 05:20:36 +07:00
|
|
|
PENDING(&t->pending, &t->blocked) ||
|
2007-05-24 03:57:44 +07:00
|
|
|
PENDING(&t->signal->shared_pending, &t->blocked)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
set_tsk_thread_flag(t, TIF_SIGPENDING);
|
2007-05-24 03:57:44 +07:00
|
|
|
return 1;
|
|
|
|
}
|
2007-06-06 17:59:00 +07:00
|
|
|
/*
|
|
|
|
* We must never clear the flag in another thread, or in current
|
|
|
|
* when it's possible the current syscall is returning -ERESTART*.
|
|
|
|
* So we don't clear it here, and only callers who know they should do.
|
|
|
|
*/
|
2007-05-24 03:57:44 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* After recalculating TIF_SIGPENDING, we need to make sure the task wakes up.
|
|
|
|
* This is superfluous when called on current, the wakeup is a harmless no-op.
|
|
|
|
*/
|
|
|
|
void recalc_sigpending_and_wake(struct task_struct *t)
|
|
|
|
{
|
|
|
|
if (recalc_sigpending_tsk(t))
|
|
|
|
signal_wake_up(t, 0);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void recalc_sigpending(void)
|
|
|
|
{
|
2011-06-02 16:14:00 +07:00
|
|
|
if (!recalc_sigpending_tsk(current) && !freezing(current))
|
2007-06-06 17:59:00 +07:00
|
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Given the mask, find the first available signal that should be serviced. */
|
|
|
|
|
2010-03-02 23:36:46 +07:00
|
|
|
#define SYNCHRONOUS_MASK \
|
|
|
|
(sigmask(SIGSEGV) | sigmask(SIGBUS) | sigmask(SIGILL) | \
|
2012-04-13 04:48:00 +07:00
|
|
|
sigmask(SIGTRAP) | sigmask(SIGFPE) | sigmask(SIGSYS))
|
2010-03-02 23:36:46 +07:00
|
|
|
|
signal/timer/event: signalfd core
This patch series implements the new signalfd() system call.
I took part of the original Linus code (and you know how badly it can be
broken :), and I added even more breakage ;) Signals are fetched from the same
signal queue used by the process, so signalfd will compete with standard
kernel delivery in dequeue_signal(). If you want to reliably fetch signals on
the signalfd file, you need to block them with sigprocmask(SIG_BLOCK). This
seems to be working fine on my Dual Opteron machine. I made a quick test
program for it:
http://www.xmailserver.org/signafd-test.c
The signalfd() system call implements signal delivery into a file descriptor
receiver. The signalfd file descriptor if created with the following API:
int signalfd(int ufd, const sigset_t *mask, size_t masksize);
The "ufd" parameter allows to change an existing signalfd sigmask, w/out going
to close/create cycle (Linus idea). Use "ufd" == -1 if you want a brand new
signalfd file.
The "mask" allows to specify the signal mask of signals that we are interested
in. The "masksize" parameter is the size of "mask".
The signalfd fd supports the poll(2) and read(2) system calls. The poll(2)
will return POLLIN when signals are available to be dequeued. As a direct
consequence of supporting the Linux poll subsystem, the signalfd fd can use
used together with epoll(2) too.
The read(2) system call will return a "struct signalfd_siginfo" structure in
the userspace supplied buffer. The return value is the number of bytes copied
in the supplied buffer, or -1 in case of error. The read(2) call can also
return 0, in case the sighand structure to which the signalfd was attached,
has been orphaned. The O_NONBLOCK flag is also supported, and read(2) will
return -EAGAIN in case no signal is available.
If the size of the buffer passed to read(2) is lower than sizeof(struct
signalfd_siginfo), -EINVAL is returned. A read from the signalfd can also
return -ERESTARTSYS in case a signal hits the process. The format of the
struct signalfd_siginfo is, and the valid fields depends of the (->code &
__SI_MASK) value, in the same way a struct siginfo would:
struct signalfd_siginfo {
__u32 signo; /* si_signo */
__s32 err; /* si_errno */
__s32 code; /* si_code */
__u32 pid; /* si_pid */
__u32 uid; /* si_uid */
__s32 fd; /* si_fd */
__u32 tid; /* si_fd */
__u32 band; /* si_band */
__u32 overrun; /* si_overrun */
__u32 trapno; /* si_trapno */
__s32 status; /* si_status */
__s32 svint; /* si_int */
__u64 svptr; /* si_ptr */
__u64 utime; /* si_utime */
__u64 stime; /* si_stime */
__u64 addr; /* si_addr */
};
[akpm@linux-foundation.org: fix signalfd_copyinfo() on i386]
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-11 12:23:13 +07:00
|
|
|
int next_signal(struct sigpending *pending, sigset_t *mask)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
unsigned long i, *s, *m, x;
|
|
|
|
int sig = 0;
|
2009-11-08 22:46:42 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
s = pending->signal.sig;
|
|
|
|
m = mask->sig;
|
2010-03-02 23:36:46 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle the first word specially: it contains the
|
|
|
|
* synchronous signals that need to be dequeued first.
|
|
|
|
*/
|
|
|
|
x = *s &~ *m;
|
|
|
|
if (x) {
|
|
|
|
if (x & SYNCHRONOUS_MASK)
|
|
|
|
x &= SYNCHRONOUS_MASK;
|
|
|
|
sig = ffz(~x) + 1;
|
|
|
|
return sig;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
switch (_NSIG_WORDS) {
|
|
|
|
default:
|
2010-03-02 23:36:46 +07:00
|
|
|
for (i = 1; i < _NSIG_WORDS; ++i) {
|
|
|
|
x = *++s &~ *++m;
|
|
|
|
if (!x)
|
|
|
|
continue;
|
|
|
|
sig = ffz(~x) + i*_NSIG_BPW + 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
|
2010-03-02 23:36:46 +07:00
|
|
|
case 2:
|
|
|
|
x = s[1] &~ m[1];
|
|
|
|
if (!x)
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
2010-03-02 23:36:46 +07:00
|
|
|
sig = ffz(~x) + _NSIG_BPW + 1;
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
|
2010-03-02 23:36:46 +07:00
|
|
|
case 1:
|
|
|
|
/* Nothing to do */
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
2009-11-08 22:46:42 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
return sig;
|
|
|
|
}
|
|
|
|
|
2009-11-08 22:46:42 +07:00
|
|
|
static inline void print_dropped_signal(int sig)
|
|
|
|
{
|
|
|
|
static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 10);
|
|
|
|
|
|
|
|
if (!print_fatal_signals)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!__ratelimit(&ratelimit_state))
|
|
|
|
return;
|
|
|
|
|
|
|
|
printk(KERN_INFO "%s/%d: reached RLIMIT_SIGPENDING, dropped signal %d\n",
|
|
|
|
current->comm, current->pid, sig);
|
|
|
|
}
|
|
|
|
|
2011-03-23 16:37:00 +07:00
|
|
|
/**
|
2011-06-02 16:14:00 +07:00
|
|
|
* task_set_jobctl_pending - set jobctl pending bits
|
2011-03-23 16:37:00 +07:00
|
|
|
* @task: target task
|
2011-06-02 16:14:00 +07:00
|
|
|
* @mask: pending bits to set
|
2011-03-23 16:37:00 +07:00
|
|
|
*
|
2011-06-02 16:14:00 +07:00
|
|
|
* Clear @mask from @task->jobctl. @mask must be subset of
|
|
|
|
* %JOBCTL_PENDING_MASK | %JOBCTL_STOP_CONSUME | %JOBCTL_STOP_SIGMASK |
|
|
|
|
* %JOBCTL_TRAPPING. If stop signo is being set, the existing signo is
|
|
|
|
* cleared. If @task is already being killed or exiting, this function
|
|
|
|
* becomes noop.
|
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @task->sighand->siglock held.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* %true if @mask is set, %false if made noop because @task was dying.
|
|
|
|
*/
|
|
|
|
bool task_set_jobctl_pending(struct task_struct *task, unsigned int mask)
|
|
|
|
{
|
|
|
|
BUG_ON(mask & ~(JOBCTL_PENDING_MASK | JOBCTL_STOP_CONSUME |
|
|
|
|
JOBCTL_STOP_SIGMASK | JOBCTL_TRAPPING));
|
|
|
|
BUG_ON((mask & JOBCTL_TRAPPING) && !(mask & JOBCTL_PENDING_MASK));
|
|
|
|
|
|
|
|
if (unlikely(fatal_signal_pending(task) || (task->flags & PF_EXITING)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (mask & JOBCTL_STOP_SIGMASK)
|
|
|
|
task->jobctl &= ~JOBCTL_STOP_SIGMASK;
|
|
|
|
|
|
|
|
task->jobctl |= mask;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-03-23 16:37:00 +07:00
|
|
|
/**
|
2011-06-02 16:13:59 +07:00
|
|
|
* task_clear_jobctl_trapping - clear jobctl trapping bit
|
2011-03-23 16:37:00 +07:00
|
|
|
* @task: target task
|
|
|
|
*
|
2011-06-02 16:13:59 +07:00
|
|
|
* If JOBCTL_TRAPPING is set, a ptracer is waiting for us to enter TRACED.
|
|
|
|
* Clear it and wake up the ptracer. Note that we don't need any further
|
|
|
|
* locking. @task->siglock guarantees that @task->parent points to the
|
|
|
|
* ptracer.
|
2011-03-23 16:37:00 +07:00
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @task->sighand->siglock held.
|
|
|
|
*/
|
2011-06-14 16:20:14 +07:00
|
|
|
void task_clear_jobctl_trapping(struct task_struct *task)
|
2011-03-23 16:37:00 +07:00
|
|
|
{
|
2011-06-02 16:13:59 +07:00
|
|
|
if (unlikely(task->jobctl & JOBCTL_TRAPPING)) {
|
|
|
|
task->jobctl &= ~JOBCTL_TRAPPING;
|
2011-06-02 16:14:00 +07:00
|
|
|
wake_up_bit(&task->jobctl, JOBCTL_TRAPPING_BIT);
|
2011-03-23 16:37:00 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
/**
|
2011-06-02 16:14:00 +07:00
|
|
|
* task_clear_jobctl_pending - clear jobctl pending bits
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
* @task: target task
|
2011-06-02 16:14:00 +07:00
|
|
|
* @mask: pending bits to clear
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
*
|
2011-06-02 16:14:00 +07:00
|
|
|
* Clear @mask from @task->jobctl. @mask must be subset of
|
|
|
|
* %JOBCTL_PENDING_MASK. If %JOBCTL_STOP_PENDING is being cleared, other
|
|
|
|
* STOP bits are cleared together.
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
*
|
2011-06-02 16:14:00 +07:00
|
|
|
* If clearing of @mask leaves no stop or trap pending, this function calls
|
|
|
|
* task_clear_jobctl_trapping().
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @task->sighand->siglock held.
|
|
|
|
*/
|
2011-06-02 16:14:00 +07:00
|
|
|
void task_clear_jobctl_pending(struct task_struct *task, unsigned int mask)
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
{
|
2011-06-02 16:14:00 +07:00
|
|
|
BUG_ON(mask & ~JOBCTL_PENDING_MASK);
|
|
|
|
|
|
|
|
if (mask & JOBCTL_STOP_PENDING)
|
|
|
|
mask |= JOBCTL_STOP_CONSUME | JOBCTL_STOP_DEQUEUED;
|
|
|
|
|
|
|
|
task->jobctl &= ~mask;
|
2011-06-02 16:14:00 +07:00
|
|
|
|
|
|
|
if (!(task->jobctl & JOBCTL_PENDING_MASK))
|
|
|
|
task_clear_jobctl_trapping(task);
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* task_participate_group_stop - participate in a group stop
|
|
|
|
* @task: task participating in a group stop
|
|
|
|
*
|
2011-06-02 16:13:59 +07:00
|
|
|
* @task has %JOBCTL_STOP_PENDING set and is participating in a group stop.
|
2011-03-23 16:37:00 +07:00
|
|
|
* Group stop states are cleared and the group stop count is consumed if
|
2011-06-02 16:13:59 +07:00
|
|
|
* %JOBCTL_STOP_CONSUME was set. If the consumption completes the group
|
2011-03-23 16:37:00 +07:00
|
|
|
* stop, the appropriate %SIGNAL_* flags are set.
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @task->sighand->siglock held.
|
job control: Don't send duplicate job control stop notification while ptraced
Just as group_exit_code shouldn't be generated when a PTRACE_CONT'd
task re-enters job control stop, notifiction for the event should be
suppressed too. The logic is the same as the group_exit_code
generation suppression in do_signal_stop(), if SIGNAL_STOP_STOPPED is
already set, the task is re-entering job control stop without
intervening SIGCONT and the notifications should be suppressed.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <signal.h>
#include <time.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static pid_t tracee, tracer;
static const char *pid_who(pid_t pid)
{
return pid == tracee ? "tracee" : (pid == tracer ? "tracer" : "mommy ");
}
static void sigchld_sigaction(int signo, siginfo_t *si, void *ucxt)
{
printf("%s: SIG status=%02d code=%02d (%s)\n",
pid_who(getpid()), si->si_status, si->si_code,
pid_who(si->si_pid));
}
int main(void)
{
const struct sigaction chld_sa = { .sa_sigaction = sigchld_sigaction,
.sa_flags = SA_SIGINFO|SA_RESTART };
siginfo_t si;
sigaction(SIGCHLD, &chld_sa, NULL);
tracee = fork();
if (!tracee) {
tracee = getpid();
while (1)
pause();
}
kill(tracee, SIGSTOP);
waitid(P_PID, tracee, &si, WSTOPPED);
tracer = fork();
if (!tracer) {
tracer = getpid();
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
printf("tracer: detaching\n");
ptrace(PTRACE_DETACH, tracee, NULL, NULL);
return 0;
}
while (1)
pause();
return 0;
}
Before the patch, the parent gets the second notification for the
tracee after the tracer detaches. si_status is zero because
group_exit_code is not set by the group stop completion which
triggered this notification.
mommy : SIG status=19 code=05 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: SIG status=19 code=04 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: detaching
mommy : SIG status=00 code=05 (tracee)
mommy : SIG status=00 code=01 (tracer)
^C
After the patch, the duplicate notification is gone.
mommy : SIG status=19 code=05 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: SIG status=19 code=04 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: detaching
mommy : SIG status=00 code=01 (tracer)
^C
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* %true if group stop completion should be notified to the parent, %false
|
|
|
|
* otherwise.
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
*/
|
|
|
|
static bool task_participate_group_stop(struct task_struct *task)
|
|
|
|
{
|
|
|
|
struct signal_struct *sig = task->signal;
|
2011-06-02 16:13:59 +07:00
|
|
|
bool consume = task->jobctl & JOBCTL_STOP_CONSUME;
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
WARN_ON_ONCE(!(task->jobctl & JOBCTL_STOP_PENDING));
|
2011-03-23 16:37:00 +07:00
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
task_clear_jobctl_pending(task, JOBCTL_STOP_PENDING);
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
|
|
|
|
if (!consume)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!WARN_ON_ONCE(sig->group_stop_count == 0))
|
|
|
|
sig->group_stop_count--;
|
|
|
|
|
job control: Don't send duplicate job control stop notification while ptraced
Just as group_exit_code shouldn't be generated when a PTRACE_CONT'd
task re-enters job control stop, notifiction for the event should be
suppressed too. The logic is the same as the group_exit_code
generation suppression in do_signal_stop(), if SIGNAL_STOP_STOPPED is
already set, the task is re-entering job control stop without
intervening SIGCONT and the notifications should be suppressed.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <signal.h>
#include <time.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static pid_t tracee, tracer;
static const char *pid_who(pid_t pid)
{
return pid == tracee ? "tracee" : (pid == tracer ? "tracer" : "mommy ");
}
static void sigchld_sigaction(int signo, siginfo_t *si, void *ucxt)
{
printf("%s: SIG status=%02d code=%02d (%s)\n",
pid_who(getpid()), si->si_status, si->si_code,
pid_who(si->si_pid));
}
int main(void)
{
const struct sigaction chld_sa = { .sa_sigaction = sigchld_sigaction,
.sa_flags = SA_SIGINFO|SA_RESTART };
siginfo_t si;
sigaction(SIGCHLD, &chld_sa, NULL);
tracee = fork();
if (!tracee) {
tracee = getpid();
while (1)
pause();
}
kill(tracee, SIGSTOP);
waitid(P_PID, tracee, &si, WSTOPPED);
tracer = fork();
if (!tracer) {
tracer = getpid();
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
printf("tracer: detaching\n");
ptrace(PTRACE_DETACH, tracee, NULL, NULL);
return 0;
}
while (1)
pause();
return 0;
}
Before the patch, the parent gets the second notification for the
tracee after the tracer detaches. si_status is zero because
group_exit_code is not set by the group stop completion which
triggered this notification.
mommy : SIG status=19 code=05 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: SIG status=19 code=04 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: detaching
mommy : SIG status=00 code=05 (tracee)
mommy : SIG status=00 code=01 (tracer)
^C
After the patch, the duplicate notification is gone.
mommy : SIG status=19 code=05 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: SIG status=19 code=04 (tracee)
tracer: SIG status=00 code=05 (tracee)
tracer: detaching
mommy : SIG status=00 code=01 (tracer)
^C
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
/*
|
|
|
|
* Tell the caller to notify completion iff we are entering into a
|
|
|
|
* fresh group stop. Read comment in do_signal_stop() for details.
|
|
|
|
*/
|
|
|
|
if (!sig->group_stop_count && !(sig->flags & SIGNAL_STOP_STOPPED)) {
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
sig->flags = SIGNAL_STOP_STOPPED;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2008-11-14 06:39:19 +07:00
|
|
|
/*
|
|
|
|
* allocate a new signal queue record
|
|
|
|
* - this may be called without locks if and only if t == current, otherwise an
|
2011-04-05 04:59:31 +07:00
|
|
|
* appropriate lock must be held to stop the target task from exiting
|
2008-11-14 06:39:19 +07:00
|
|
|
*/
|
2009-11-08 22:46:42 +07:00
|
|
|
static struct sigqueue *
|
|
|
|
__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimit)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct sigqueue *q = NULL;
|
2006-11-05 04:03:00 +07:00
|
|
|
struct user_struct *user;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-11-05 04:03:00 +07:00
|
|
|
/*
|
2009-12-10 07:53:21 +07:00
|
|
|
* Protect access to @t credentials. This can go away when all
|
|
|
|
* callers hold rcu read lock.
|
2006-11-05 04:03:00 +07:00
|
|
|
*/
|
2009-12-10 07:53:21 +07:00
|
|
|
rcu_read_lock();
|
CRED: Inaugurate COW credentials
Inaugurate copy-on-write credentials management. This uses RCU to manage the
credentials pointer in the task_struct with respect to accesses by other tasks.
A process may only modify its own credentials, and so does not need locking to
access or modify its own credentials.
A mutex (cred_replace_mutex) is added to the task_struct to control the effect
of PTRACE_ATTACHED on credential calculations, particularly with respect to
execve().
With this patch, the contents of an active credentials struct may not be
changed directly; rather a new set of credentials must be prepared, modified
and committed using something like the following sequence of events:
struct cred *new = prepare_creds();
int ret = blah(new);
if (ret < 0) {
abort_creds(new);
return ret;
}
return commit_creds(new);
There are some exceptions to this rule: the keyrings pointed to by the active
credentials may be instantiated - keyrings violate the COW rule as managing
COW keyrings is tricky, given that it is possible for a task to directly alter
the keys in a keyring in use by another task.
To help enforce this, various pointers to sets of credentials, such as those in
the task_struct, are declared const. The purpose of this is compile-time
discouragement of altering credentials through those pointers. Once a set of
credentials has been made public through one of these pointers, it may not be
modified, except under special circumstances:
(1) Its reference count may incremented and decremented.
(2) The keyrings to which it points may be modified, but not replaced.
The only safe way to modify anything else is to create a replacement and commit
using the functions described in Documentation/credentials.txt (which will be
added by a later patch).
This patch and the preceding patches have been tested with the LTP SELinux
testsuite.
This patch makes several logical sets of alteration:
(1) execve().
This now prepares and commits credentials in various places in the
security code rather than altering the current creds directly.
(2) Temporary credential overrides.
do_coredump() and sys_faccessat() now prepare their own credentials and
temporarily override the ones currently on the acting thread, whilst
preventing interference from other threads by holding cred_replace_mutex
on the thread being dumped.
This will be replaced in a future patch by something that hands down the
credentials directly to the functions being called, rather than altering
the task's objective credentials.
(3) LSM interface.
A number of functions have been changed, added or removed:
(*) security_capset_check(), ->capset_check()
(*) security_capset_set(), ->capset_set()
Removed in favour of security_capset().
(*) security_capset(), ->capset()
New. This is passed a pointer to the new creds, a pointer to the old
creds and the proposed capability sets. It should fill in the new
creds or return an error. All pointers, barring the pointer to the
new creds, are now const.
(*) security_bprm_apply_creds(), ->bprm_apply_creds()
Changed; now returns a value, which will cause the process to be
killed if it's an error.
(*) security_task_alloc(), ->task_alloc_security()
Removed in favour of security_prepare_creds().
(*) security_cred_free(), ->cred_free()
New. Free security data attached to cred->security.
(*) security_prepare_creds(), ->cred_prepare()
New. Duplicate any security data attached to cred->security.
(*) security_commit_creds(), ->cred_commit()
New. Apply any security effects for the upcoming installation of new
security by commit_creds().
(*) security_task_post_setuid(), ->task_post_setuid()
Removed in favour of security_task_fix_setuid().
(*) security_task_fix_setuid(), ->task_fix_setuid()
Fix up the proposed new credentials for setuid(). This is used by
cap_set_fix_setuid() to implicitly adjust capabilities in line with
setuid() changes. Changes are made to the new credentials, rather
than the task itself as in security_task_post_setuid().
(*) security_task_reparent_to_init(), ->task_reparent_to_init()
Removed. Instead the task being reparented to init is referred
directly to init's credentials.
NOTE! This results in the loss of some state: SELinux's osid no
longer records the sid of the thread that forked it.
(*) security_key_alloc(), ->key_alloc()
(*) security_key_permission(), ->key_permission()
Changed. These now take cred pointers rather than task pointers to
refer to the security context.
(4) sys_capset().
This has been simplified and uses less locking. The LSM functions it
calls have been merged.
(5) reparent_to_kthreadd().
This gives the current thread the same credentials as init by simply using
commit_thread() to point that way.
(6) __sigqueue_alloc() and switch_uid()
__sigqueue_alloc() can't stop the target task from changing its creds
beneath it, so this function gets a reference to the currently applicable
user_struct which it then passes into the sigqueue struct it returns if
successful.
switch_uid() is now called from commit_creds(), and possibly should be
folded into that. commit_creds() should take care of protecting
__sigqueue_alloc().
(7) [sg]et[ug]id() and co and [sg]et_current_groups.
The set functions now all use prepare_creds(), commit_creds() and
abort_creds() to build and check a new set of credentials before applying
it.
security_task_set[ug]id() is called inside the prepared section. This
guarantees that nothing else will affect the creds until we've finished.
The calling of set_dumpable() has been moved into commit_creds().
Much of the functionality of set_user() has been moved into
commit_creds().
The get functions all simply access the data directly.
(8) security_task_prctl() and cap_task_prctl().
security_task_prctl() has been modified to return -ENOSYS if it doesn't
want to handle a function, or otherwise return the return value directly
rather than through an argument.
Additionally, cap_task_prctl() now prepares a new set of credentials, even
if it doesn't end up using it.
(9) Keyrings.
A number of changes have been made to the keyrings code:
(a) switch_uid_keyring(), copy_keys(), exit_keys() and suid_keys() have
all been dropped and built in to the credentials functions directly.
They may want separating out again later.
(b) key_alloc() and search_process_keyrings() now take a cred pointer
rather than a task pointer to specify the security context.
(c) copy_creds() gives a new thread within the same thread group a new
thread keyring if its parent had one, otherwise it discards the thread
keyring.
(d) The authorisation key now points directly to the credentials to extend
the search into rather pointing to the task that carries them.
(e) Installing thread, process or session keyrings causes a new set of
credentials to be created, even though it's not strictly necessary for
process or session keyrings (they're shared).
(10) Usermode helper.
The usermode helper code now carries a cred struct pointer in its
subprocess_info struct instead of a new session keyring pointer. This set
of credentials is derived from init_cred and installed on the new process
after it has been cloned.
call_usermodehelper_setup() allocates the new credentials and
call_usermodehelper_freeinfo() discards them if they haven't been used. A
special cred function (prepare_usermodeinfo_creds()) is provided
specifically for call_usermodehelper_setup() to call.
call_usermodehelper_setkeys() adjusts the credentials to sport the
supplied keyring as the new session keyring.
(11) SELinux.
SELinux has a number of changes, in addition to those to support the LSM
interface changes mentioned above:
(a) selinux_setprocattr() no longer does its check for whether the
current ptracer can access processes with the new SID inside the lock
that covers getting the ptracer's SID. Whilst this lock ensures that
the check is done with the ptracer pinned, the result is only valid
until the lock is released, so there's no point doing it inside the
lock.
(12) is_single_threaded().
This function has been extracted from selinux_setprocattr() and put into
a file of its own in the lib/ directory as join_session_keyring() now
wants to use it too.
The code in SELinux just checked to see whether a task shared mm_structs
with other tasks (CLONE_VM), but that isn't good enough. We really want
to know if they're part of the same thread group (CLONE_THREAD).
(13) nfsd.
The NFS server daemon now has to use the COW credentials to set the
credentials it is going to use. It really needs to pass the credentials
down to the functions it calls, but it can't do that until other patches
in this series have been applied.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 06:39:23 +07:00
|
|
|
user = get_uid(__task_cred(t)->user);
|
2006-11-05 04:03:00 +07:00
|
|
|
atomic_inc(&user->sigpending);
|
2009-12-10 07:53:21 +07:00
|
|
|
rcu_read_unlock();
|
2009-11-08 22:46:42 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (override_rlimit ||
|
2006-11-05 04:03:00 +07:00
|
|
|
atomic_read(&user->sigpending) <=
|
2010-03-06 04:42:54 +07:00
|
|
|
task_rlimit(t, RLIMIT_SIGPENDING)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
q = kmem_cache_alloc(sigqueue_cachep, flags);
|
2009-11-08 22:46:42 +07:00
|
|
|
} else {
|
|
|
|
print_dropped_signal(sig);
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (unlikely(q == NULL)) {
|
2006-11-05 04:03:00 +07:00
|
|
|
atomic_dec(&user->sigpending);
|
CRED: Inaugurate COW credentials
Inaugurate copy-on-write credentials management. This uses RCU to manage the
credentials pointer in the task_struct with respect to accesses by other tasks.
A process may only modify its own credentials, and so does not need locking to
access or modify its own credentials.
A mutex (cred_replace_mutex) is added to the task_struct to control the effect
of PTRACE_ATTACHED on credential calculations, particularly with respect to
execve().
With this patch, the contents of an active credentials struct may not be
changed directly; rather a new set of credentials must be prepared, modified
and committed using something like the following sequence of events:
struct cred *new = prepare_creds();
int ret = blah(new);
if (ret < 0) {
abort_creds(new);
return ret;
}
return commit_creds(new);
There are some exceptions to this rule: the keyrings pointed to by the active
credentials may be instantiated - keyrings violate the COW rule as managing
COW keyrings is tricky, given that it is possible for a task to directly alter
the keys in a keyring in use by another task.
To help enforce this, various pointers to sets of credentials, such as those in
the task_struct, are declared const. The purpose of this is compile-time
discouragement of altering credentials through those pointers. Once a set of
credentials has been made public through one of these pointers, it may not be
modified, except under special circumstances:
(1) Its reference count may incremented and decremented.
(2) The keyrings to which it points may be modified, but not replaced.
The only safe way to modify anything else is to create a replacement and commit
using the functions described in Documentation/credentials.txt (which will be
added by a later patch).
This patch and the preceding patches have been tested with the LTP SELinux
testsuite.
This patch makes several logical sets of alteration:
(1) execve().
This now prepares and commits credentials in various places in the
security code rather than altering the current creds directly.
(2) Temporary credential overrides.
do_coredump() and sys_faccessat() now prepare their own credentials and
temporarily override the ones currently on the acting thread, whilst
preventing interference from other threads by holding cred_replace_mutex
on the thread being dumped.
This will be replaced in a future patch by something that hands down the
credentials directly to the functions being called, rather than altering
the task's objective credentials.
(3) LSM interface.
A number of functions have been changed, added or removed:
(*) security_capset_check(), ->capset_check()
(*) security_capset_set(), ->capset_set()
Removed in favour of security_capset().
(*) security_capset(), ->capset()
New. This is passed a pointer to the new creds, a pointer to the old
creds and the proposed capability sets. It should fill in the new
creds or return an error. All pointers, barring the pointer to the
new creds, are now const.
(*) security_bprm_apply_creds(), ->bprm_apply_creds()
Changed; now returns a value, which will cause the process to be
killed if it's an error.
(*) security_task_alloc(), ->task_alloc_security()
Removed in favour of security_prepare_creds().
(*) security_cred_free(), ->cred_free()
New. Free security data attached to cred->security.
(*) security_prepare_creds(), ->cred_prepare()
New. Duplicate any security data attached to cred->security.
(*) security_commit_creds(), ->cred_commit()
New. Apply any security effects for the upcoming installation of new
security by commit_creds().
(*) security_task_post_setuid(), ->task_post_setuid()
Removed in favour of security_task_fix_setuid().
(*) security_task_fix_setuid(), ->task_fix_setuid()
Fix up the proposed new credentials for setuid(). This is used by
cap_set_fix_setuid() to implicitly adjust capabilities in line with
setuid() changes. Changes are made to the new credentials, rather
than the task itself as in security_task_post_setuid().
(*) security_task_reparent_to_init(), ->task_reparent_to_init()
Removed. Instead the task being reparented to init is referred
directly to init's credentials.
NOTE! This results in the loss of some state: SELinux's osid no
longer records the sid of the thread that forked it.
(*) security_key_alloc(), ->key_alloc()
(*) security_key_permission(), ->key_permission()
Changed. These now take cred pointers rather than task pointers to
refer to the security context.
(4) sys_capset().
This has been simplified and uses less locking. The LSM functions it
calls have been merged.
(5) reparent_to_kthreadd().
This gives the current thread the same credentials as init by simply using
commit_thread() to point that way.
(6) __sigqueue_alloc() and switch_uid()
__sigqueue_alloc() can't stop the target task from changing its creds
beneath it, so this function gets a reference to the currently applicable
user_struct which it then passes into the sigqueue struct it returns if
successful.
switch_uid() is now called from commit_creds(), and possibly should be
folded into that. commit_creds() should take care of protecting
__sigqueue_alloc().
(7) [sg]et[ug]id() and co and [sg]et_current_groups.
The set functions now all use prepare_creds(), commit_creds() and
abort_creds() to build and check a new set of credentials before applying
it.
security_task_set[ug]id() is called inside the prepared section. This
guarantees that nothing else will affect the creds until we've finished.
The calling of set_dumpable() has been moved into commit_creds().
Much of the functionality of set_user() has been moved into
commit_creds().
The get functions all simply access the data directly.
(8) security_task_prctl() and cap_task_prctl().
security_task_prctl() has been modified to return -ENOSYS if it doesn't
want to handle a function, or otherwise return the return value directly
rather than through an argument.
Additionally, cap_task_prctl() now prepares a new set of credentials, even
if it doesn't end up using it.
(9) Keyrings.
A number of changes have been made to the keyrings code:
(a) switch_uid_keyring(), copy_keys(), exit_keys() and suid_keys() have
all been dropped and built in to the credentials functions directly.
They may want separating out again later.
(b) key_alloc() and search_process_keyrings() now take a cred pointer
rather than a task pointer to specify the security context.
(c) copy_creds() gives a new thread within the same thread group a new
thread keyring if its parent had one, otherwise it discards the thread
keyring.
(d) The authorisation key now points directly to the credentials to extend
the search into rather pointing to the task that carries them.
(e) Installing thread, process or session keyrings causes a new set of
credentials to be created, even though it's not strictly necessary for
process or session keyrings (they're shared).
(10) Usermode helper.
The usermode helper code now carries a cred struct pointer in its
subprocess_info struct instead of a new session keyring pointer. This set
of credentials is derived from init_cred and installed on the new process
after it has been cloned.
call_usermodehelper_setup() allocates the new credentials and
call_usermodehelper_freeinfo() discards them if they haven't been used. A
special cred function (prepare_usermodeinfo_creds()) is provided
specifically for call_usermodehelper_setup() to call.
call_usermodehelper_setkeys() adjusts the credentials to sport the
supplied keyring as the new session keyring.
(11) SELinux.
SELinux has a number of changes, in addition to those to support the LSM
interface changes mentioned above:
(a) selinux_setprocattr() no longer does its check for whether the
current ptracer can access processes with the new SID inside the lock
that covers getting the ptracer's SID. Whilst this lock ensures that
the check is done with the ptracer pinned, the result is only valid
until the lock is released, so there's no point doing it inside the
lock.
(12) is_single_threaded().
This function has been extracted from selinux_setprocattr() and put into
a file of its own in the lib/ directory as join_session_keyring() now
wants to use it too.
The code in SELinux just checked to see whether a task shared mm_structs
with other tasks (CLONE_VM), but that isn't good enough. We really want
to know if they're part of the same thread group (CLONE_THREAD).
(13) nfsd.
The NFS server daemon now has to use the COW credentials to set the
credentials it is going to use. It really needs to pass the credentials
down to the functions it calls, but it can't do that until other patches
in this series have been applied.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 06:39:23 +07:00
|
|
|
free_uid(user);
|
2005-04-17 05:20:36 +07:00
|
|
|
} else {
|
|
|
|
INIT_LIST_HEAD(&q->list);
|
|
|
|
q->flags = 0;
|
CRED: Inaugurate COW credentials
Inaugurate copy-on-write credentials management. This uses RCU to manage the
credentials pointer in the task_struct with respect to accesses by other tasks.
A process may only modify its own credentials, and so does not need locking to
access or modify its own credentials.
A mutex (cred_replace_mutex) is added to the task_struct to control the effect
of PTRACE_ATTACHED on credential calculations, particularly with respect to
execve().
With this patch, the contents of an active credentials struct may not be
changed directly; rather a new set of credentials must be prepared, modified
and committed using something like the following sequence of events:
struct cred *new = prepare_creds();
int ret = blah(new);
if (ret < 0) {
abort_creds(new);
return ret;
}
return commit_creds(new);
There are some exceptions to this rule: the keyrings pointed to by the active
credentials may be instantiated - keyrings violate the COW rule as managing
COW keyrings is tricky, given that it is possible for a task to directly alter
the keys in a keyring in use by another task.
To help enforce this, various pointers to sets of credentials, such as those in
the task_struct, are declared const. The purpose of this is compile-time
discouragement of altering credentials through those pointers. Once a set of
credentials has been made public through one of these pointers, it may not be
modified, except under special circumstances:
(1) Its reference count may incremented and decremented.
(2) The keyrings to which it points may be modified, but not replaced.
The only safe way to modify anything else is to create a replacement and commit
using the functions described in Documentation/credentials.txt (which will be
added by a later patch).
This patch and the preceding patches have been tested with the LTP SELinux
testsuite.
This patch makes several logical sets of alteration:
(1) execve().
This now prepares and commits credentials in various places in the
security code rather than altering the current creds directly.
(2) Temporary credential overrides.
do_coredump() and sys_faccessat() now prepare their own credentials and
temporarily override the ones currently on the acting thread, whilst
preventing interference from other threads by holding cred_replace_mutex
on the thread being dumped.
This will be replaced in a future patch by something that hands down the
credentials directly to the functions being called, rather than altering
the task's objective credentials.
(3) LSM interface.
A number of functions have been changed, added or removed:
(*) security_capset_check(), ->capset_check()
(*) security_capset_set(), ->capset_set()
Removed in favour of security_capset().
(*) security_capset(), ->capset()
New. This is passed a pointer to the new creds, a pointer to the old
creds and the proposed capability sets. It should fill in the new
creds or return an error. All pointers, barring the pointer to the
new creds, are now const.
(*) security_bprm_apply_creds(), ->bprm_apply_creds()
Changed; now returns a value, which will cause the process to be
killed if it's an error.
(*) security_task_alloc(), ->task_alloc_security()
Removed in favour of security_prepare_creds().
(*) security_cred_free(), ->cred_free()
New. Free security data attached to cred->security.
(*) security_prepare_creds(), ->cred_prepare()
New. Duplicate any security data attached to cred->security.
(*) security_commit_creds(), ->cred_commit()
New. Apply any security effects for the upcoming installation of new
security by commit_creds().
(*) security_task_post_setuid(), ->task_post_setuid()
Removed in favour of security_task_fix_setuid().
(*) security_task_fix_setuid(), ->task_fix_setuid()
Fix up the proposed new credentials for setuid(). This is used by
cap_set_fix_setuid() to implicitly adjust capabilities in line with
setuid() changes. Changes are made to the new credentials, rather
than the task itself as in security_task_post_setuid().
(*) security_task_reparent_to_init(), ->task_reparent_to_init()
Removed. Instead the task being reparented to init is referred
directly to init's credentials.
NOTE! This results in the loss of some state: SELinux's osid no
longer records the sid of the thread that forked it.
(*) security_key_alloc(), ->key_alloc()
(*) security_key_permission(), ->key_permission()
Changed. These now take cred pointers rather than task pointers to
refer to the security context.
(4) sys_capset().
This has been simplified and uses less locking. The LSM functions it
calls have been merged.
(5) reparent_to_kthreadd().
This gives the current thread the same credentials as init by simply using
commit_thread() to point that way.
(6) __sigqueue_alloc() and switch_uid()
__sigqueue_alloc() can't stop the target task from changing its creds
beneath it, so this function gets a reference to the currently applicable
user_struct which it then passes into the sigqueue struct it returns if
successful.
switch_uid() is now called from commit_creds(), and possibly should be
folded into that. commit_creds() should take care of protecting
__sigqueue_alloc().
(7) [sg]et[ug]id() and co and [sg]et_current_groups.
The set functions now all use prepare_creds(), commit_creds() and
abort_creds() to build and check a new set of credentials before applying
it.
security_task_set[ug]id() is called inside the prepared section. This
guarantees that nothing else will affect the creds until we've finished.
The calling of set_dumpable() has been moved into commit_creds().
Much of the functionality of set_user() has been moved into
commit_creds().
The get functions all simply access the data directly.
(8) security_task_prctl() and cap_task_prctl().
security_task_prctl() has been modified to return -ENOSYS if it doesn't
want to handle a function, or otherwise return the return value directly
rather than through an argument.
Additionally, cap_task_prctl() now prepares a new set of credentials, even
if it doesn't end up using it.
(9) Keyrings.
A number of changes have been made to the keyrings code:
(a) switch_uid_keyring(), copy_keys(), exit_keys() and suid_keys() have
all been dropped and built in to the credentials functions directly.
They may want separating out again later.
(b) key_alloc() and search_process_keyrings() now take a cred pointer
rather than a task pointer to specify the security context.
(c) copy_creds() gives a new thread within the same thread group a new
thread keyring if its parent had one, otherwise it discards the thread
keyring.
(d) The authorisation key now points directly to the credentials to extend
the search into rather pointing to the task that carries them.
(e) Installing thread, process or session keyrings causes a new set of
credentials to be created, even though it's not strictly necessary for
process or session keyrings (they're shared).
(10) Usermode helper.
The usermode helper code now carries a cred struct pointer in its
subprocess_info struct instead of a new session keyring pointer. This set
of credentials is derived from init_cred and installed on the new process
after it has been cloned.
call_usermodehelper_setup() allocates the new credentials and
call_usermodehelper_freeinfo() discards them if they haven't been used. A
special cred function (prepare_usermodeinfo_creds()) is provided
specifically for call_usermodehelper_setup() to call.
call_usermodehelper_setkeys() adjusts the credentials to sport the
supplied keyring as the new session keyring.
(11) SELinux.
SELinux has a number of changes, in addition to those to support the LSM
interface changes mentioned above:
(a) selinux_setprocattr() no longer does its check for whether the
current ptracer can access processes with the new SID inside the lock
that covers getting the ptracer's SID. Whilst this lock ensures that
the check is done with the ptracer pinned, the result is only valid
until the lock is released, so there's no point doing it inside the
lock.
(12) is_single_threaded().
This function has been extracted from selinux_setprocattr() and put into
a file of its own in the lib/ directory as join_session_keyring() now
wants to use it too.
The code in SELinux just checked to see whether a task shared mm_structs
with other tasks (CLONE_VM), but that isn't good enough. We really want
to know if they're part of the same thread group (CLONE_THREAD).
(13) nfsd.
The NFS server daemon now has to use the COW credentials to set the
credentials it is going to use. It really needs to pass the credentials
down to the functions it calls, but it can't do that until other patches
in this series have been applied.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 06:39:23 +07:00
|
|
|
q->user = user;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
CRED: Inaugurate COW credentials
Inaugurate copy-on-write credentials management. This uses RCU to manage the
credentials pointer in the task_struct with respect to accesses by other tasks.
A process may only modify its own credentials, and so does not need locking to
access or modify its own credentials.
A mutex (cred_replace_mutex) is added to the task_struct to control the effect
of PTRACE_ATTACHED on credential calculations, particularly with respect to
execve().
With this patch, the contents of an active credentials struct may not be
changed directly; rather a new set of credentials must be prepared, modified
and committed using something like the following sequence of events:
struct cred *new = prepare_creds();
int ret = blah(new);
if (ret < 0) {
abort_creds(new);
return ret;
}
return commit_creds(new);
There are some exceptions to this rule: the keyrings pointed to by the active
credentials may be instantiated - keyrings violate the COW rule as managing
COW keyrings is tricky, given that it is possible for a task to directly alter
the keys in a keyring in use by another task.
To help enforce this, various pointers to sets of credentials, such as those in
the task_struct, are declared const. The purpose of this is compile-time
discouragement of altering credentials through those pointers. Once a set of
credentials has been made public through one of these pointers, it may not be
modified, except under special circumstances:
(1) Its reference count may incremented and decremented.
(2) The keyrings to which it points may be modified, but not replaced.
The only safe way to modify anything else is to create a replacement and commit
using the functions described in Documentation/credentials.txt (which will be
added by a later patch).
This patch and the preceding patches have been tested with the LTP SELinux
testsuite.
This patch makes several logical sets of alteration:
(1) execve().
This now prepares and commits credentials in various places in the
security code rather than altering the current creds directly.
(2) Temporary credential overrides.
do_coredump() and sys_faccessat() now prepare their own credentials and
temporarily override the ones currently on the acting thread, whilst
preventing interference from other threads by holding cred_replace_mutex
on the thread being dumped.
This will be replaced in a future patch by something that hands down the
credentials directly to the functions being called, rather than altering
the task's objective credentials.
(3) LSM interface.
A number of functions have been changed, added or removed:
(*) security_capset_check(), ->capset_check()
(*) security_capset_set(), ->capset_set()
Removed in favour of security_capset().
(*) security_capset(), ->capset()
New. This is passed a pointer to the new creds, a pointer to the old
creds and the proposed capability sets. It should fill in the new
creds or return an error. All pointers, barring the pointer to the
new creds, are now const.
(*) security_bprm_apply_creds(), ->bprm_apply_creds()
Changed; now returns a value, which will cause the process to be
killed if it's an error.
(*) security_task_alloc(), ->task_alloc_security()
Removed in favour of security_prepare_creds().
(*) security_cred_free(), ->cred_free()
New. Free security data attached to cred->security.
(*) security_prepare_creds(), ->cred_prepare()
New. Duplicate any security data attached to cred->security.
(*) security_commit_creds(), ->cred_commit()
New. Apply any security effects for the upcoming installation of new
security by commit_creds().
(*) security_task_post_setuid(), ->task_post_setuid()
Removed in favour of security_task_fix_setuid().
(*) security_task_fix_setuid(), ->task_fix_setuid()
Fix up the proposed new credentials for setuid(). This is used by
cap_set_fix_setuid() to implicitly adjust capabilities in line with
setuid() changes. Changes are made to the new credentials, rather
than the task itself as in security_task_post_setuid().
(*) security_task_reparent_to_init(), ->task_reparent_to_init()
Removed. Instead the task being reparented to init is referred
directly to init's credentials.
NOTE! This results in the loss of some state: SELinux's osid no
longer records the sid of the thread that forked it.
(*) security_key_alloc(), ->key_alloc()
(*) security_key_permission(), ->key_permission()
Changed. These now take cred pointers rather than task pointers to
refer to the security context.
(4) sys_capset().
This has been simplified and uses less locking. The LSM functions it
calls have been merged.
(5) reparent_to_kthreadd().
This gives the current thread the same credentials as init by simply using
commit_thread() to point that way.
(6) __sigqueue_alloc() and switch_uid()
__sigqueue_alloc() can't stop the target task from changing its creds
beneath it, so this function gets a reference to the currently applicable
user_struct which it then passes into the sigqueue struct it returns if
successful.
switch_uid() is now called from commit_creds(), and possibly should be
folded into that. commit_creds() should take care of protecting
__sigqueue_alloc().
(7) [sg]et[ug]id() and co and [sg]et_current_groups.
The set functions now all use prepare_creds(), commit_creds() and
abort_creds() to build and check a new set of credentials before applying
it.
security_task_set[ug]id() is called inside the prepared section. This
guarantees that nothing else will affect the creds until we've finished.
The calling of set_dumpable() has been moved into commit_creds().
Much of the functionality of set_user() has been moved into
commit_creds().
The get functions all simply access the data directly.
(8) security_task_prctl() and cap_task_prctl().
security_task_prctl() has been modified to return -ENOSYS if it doesn't
want to handle a function, or otherwise return the return value directly
rather than through an argument.
Additionally, cap_task_prctl() now prepares a new set of credentials, even
if it doesn't end up using it.
(9) Keyrings.
A number of changes have been made to the keyrings code:
(a) switch_uid_keyring(), copy_keys(), exit_keys() and suid_keys() have
all been dropped and built in to the credentials functions directly.
They may want separating out again later.
(b) key_alloc() and search_process_keyrings() now take a cred pointer
rather than a task pointer to specify the security context.
(c) copy_creds() gives a new thread within the same thread group a new
thread keyring if its parent had one, otherwise it discards the thread
keyring.
(d) The authorisation key now points directly to the credentials to extend
the search into rather pointing to the task that carries them.
(e) Installing thread, process or session keyrings causes a new set of
credentials to be created, even though it's not strictly necessary for
process or session keyrings (they're shared).
(10) Usermode helper.
The usermode helper code now carries a cred struct pointer in its
subprocess_info struct instead of a new session keyring pointer. This set
of credentials is derived from init_cred and installed on the new process
after it has been cloned.
call_usermodehelper_setup() allocates the new credentials and
call_usermodehelper_freeinfo() discards them if they haven't been used. A
special cred function (prepare_usermodeinfo_creds()) is provided
specifically for call_usermodehelper_setup() to call.
call_usermodehelper_setkeys() adjusts the credentials to sport the
supplied keyring as the new session keyring.
(11) SELinux.
SELinux has a number of changes, in addition to those to support the LSM
interface changes mentioned above:
(a) selinux_setprocattr() no longer does its check for whether the
current ptracer can access processes with the new SID inside the lock
that covers getting the ptracer's SID. Whilst this lock ensures that
the check is done with the ptracer pinned, the result is only valid
until the lock is released, so there's no point doing it inside the
lock.
(12) is_single_threaded().
This function has been extracted from selinux_setprocattr() and put into
a file of its own in the lib/ directory as join_session_keyring() now
wants to use it too.
The code in SELinux just checked to see whether a task shared mm_structs
with other tasks (CLONE_VM), but that isn't good enough. We really want
to know if they're part of the same thread group (CLONE_THREAD).
(13) nfsd.
The NFS server daemon now has to use the COW credentials to set the
credentials it is going to use. It really needs to pass the credentials
down to the functions it calls, but it can't do that until other patches
in this series have been applied.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 06:39:23 +07:00
|
|
|
|
|
|
|
return q;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2006-02-03 18:04:41 +07:00
|
|
|
static void __sigqueue_free(struct sigqueue *q)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
if (q->flags & SIGQUEUE_PREALLOC)
|
|
|
|
return;
|
|
|
|
atomic_dec(&q->user->sigpending);
|
|
|
|
free_uid(q->user);
|
|
|
|
kmem_cache_free(sigqueue_cachep, q);
|
|
|
|
}
|
|
|
|
|
2006-03-29 07:11:18 +07:00
|
|
|
void flush_sigqueue(struct sigpending *queue)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct sigqueue *q;
|
|
|
|
|
|
|
|
sigemptyset(&queue->signal);
|
|
|
|
while (!list_empty(&queue->list)) {
|
|
|
|
q = list_entry(queue->list.next, struct sigqueue , list);
|
|
|
|
list_del_init(&q->list);
|
|
|
|
__sigqueue_free(q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Flush all pending signals for a task.
|
|
|
|
*/
|
2009-04-29 19:45:05 +07:00
|
|
|
void __flush_signals(struct task_struct *t)
|
|
|
|
{
|
|
|
|
clear_tsk_thread_flag(t, TIF_SIGPENDING);
|
|
|
|
flush_sigqueue(&t->pending);
|
|
|
|
flush_sigqueue(&t->signal->shared_pending);
|
|
|
|
}
|
|
|
|
|
2006-03-29 07:11:17 +07:00
|
|
|
void flush_signals(struct task_struct *t)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&t->sighand->siglock, flags);
|
2009-04-29 19:45:05 +07:00
|
|
|
__flush_signals(t);
|
2005-04-17 05:20:36 +07:00
|
|
|
spin_unlock_irqrestore(&t->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
2008-05-26 23:55:42 +07:00
|
|
|
static void __flush_itimer_signals(struct sigpending *pending)
|
|
|
|
{
|
|
|
|
sigset_t signal, retain;
|
|
|
|
struct sigqueue *q, *n;
|
|
|
|
|
|
|
|
signal = pending->signal;
|
|
|
|
sigemptyset(&retain);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(q, n, &pending->list, list) {
|
|
|
|
int sig = q->info.si_signo;
|
|
|
|
|
|
|
|
if (likely(q->info.si_code != SI_TIMER)) {
|
|
|
|
sigaddset(&retain, sig);
|
|
|
|
} else {
|
|
|
|
sigdelset(&signal, sig);
|
|
|
|
list_del_init(&q->list);
|
|
|
|
__sigqueue_free(q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sigorsets(&pending->signal, &signal, &retain);
|
|
|
|
}
|
|
|
|
|
|
|
|
void flush_itimer_signals(void)
|
|
|
|
{
|
|
|
|
struct task_struct *tsk = current;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&tsk->sighand->siglock, flags);
|
|
|
|
__flush_itimer_signals(&tsk->pending);
|
|
|
|
__flush_itimer_signals(&tsk->signal->shared_pending);
|
|
|
|
spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
2007-05-09 16:34:37 +07:00
|
|
|
void ignore_signals(struct task_struct *t)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < _NSIG; ++i)
|
|
|
|
t->sighand->action[i].sa.sa_handler = SIG_IGN;
|
|
|
|
|
|
|
|
flush_signals(t);
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Flush all handlers for a task.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
flush_signal_handlers(struct task_struct *t, int force_default)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct k_sigaction *ka = &t->sighand->action[0];
|
|
|
|
for (i = _NSIG ; i != 0 ; i--) {
|
|
|
|
if (force_default || ka->sa.sa_handler != SIG_IGN)
|
|
|
|
ka->sa.sa_handler = SIG_DFL;
|
|
|
|
ka->sa.sa_flags = 0;
|
2013-03-14 04:59:34 +07:00
|
|
|
#ifdef __ARCH_HAS_SA_RESTORER
|
2013-03-14 04:59:33 +07:00
|
|
|
ka->sa.sa_restorer = NULL;
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
sigemptyset(&ka->sa.sa_mask);
|
|
|
|
ka++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-22 16:12:28 +07:00
|
|
|
int unhandled_signal(struct task_struct *tsk, int sig)
|
|
|
|
{
|
2008-07-26 09:45:52 +07:00
|
|
|
void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
|
2007-10-19 13:39:52 +07:00
|
|
|
if (is_global_init(tsk))
|
2007-07-22 16:12:28 +07:00
|
|
|
return 1;
|
2008-07-26 09:45:52 +07:00
|
|
|
if (handler != SIG_IGN && handler != SIG_DFL)
|
2007-07-22 16:12:28 +07:00
|
|
|
return 0;
|
2011-06-17 21:50:37 +07:00
|
|
|
/* if ptraced, let the tracer determine */
|
|
|
|
return !tsk->ptrace;
|
2007-07-22 16:12:28 +07:00
|
|
|
}
|
|
|
|
|
2011-04-05 04:59:31 +07:00
|
|
|
/*
|
|
|
|
* Notify the system that a driver wants to block all signals for this
|
2005-04-17 05:20:36 +07:00
|
|
|
* process, and wants to be notified if any signals at all were to be
|
|
|
|
* sent/acted upon. If the notifier routine returns non-zero, then the
|
|
|
|
* signal will be acted upon after all. If the notifier routine returns 0,
|
|
|
|
* then then signal will be blocked. Only one block per process is
|
|
|
|
* allowed. priv is a pointer to private data that the notifier routine
|
2011-04-05 04:59:31 +07:00
|
|
|
* can use to determine if the signal should be blocked or not.
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
void
|
|
|
|
block_all_signals(int (*notifier)(void *priv), void *priv, sigset_t *mask)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(¤t->sighand->siglock, flags);
|
|
|
|
current->notifier_mask = mask;
|
|
|
|
current->notifier_data = priv;
|
|
|
|
current->notifier = notifier;
|
|
|
|
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Notify the system that blocking has ended. */
|
|
|
|
|
|
|
|
void
|
|
|
|
unblock_all_signals(void)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(¤t->sighand->siglock, flags);
|
|
|
|
current->notifier = NULL;
|
|
|
|
current->notifier_data = NULL;
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
2008-07-25 15:47:29 +07:00
|
|
|
static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct sigqueue *q, *first = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Collect the siginfo appropriate to this signal. Check if
|
|
|
|
* there is another siginfo for the same signal.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(q, &list->list, list) {
|
|
|
|
if (q->info.si_signo == sig) {
|
2008-07-25 15:47:28 +07:00
|
|
|
if (first)
|
|
|
|
goto still_pending;
|
2005-04-17 05:20:36 +07:00
|
|
|
first = q;
|
|
|
|
}
|
|
|
|
}
|
2008-07-25 15:47:28 +07:00
|
|
|
|
|
|
|
sigdelset(&list->signal, sig);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (first) {
|
2008-07-25 15:47:28 +07:00
|
|
|
still_pending:
|
2005-04-17 05:20:36 +07:00
|
|
|
list_del_init(&first->list);
|
|
|
|
copy_siginfo(info, &first->info);
|
|
|
|
__sigqueue_free(first);
|
|
|
|
} else {
|
2011-04-05 04:59:31 +07:00
|
|
|
/*
|
|
|
|
* Ok, it wasn't in the queue. This must be
|
|
|
|
* a fast-pathed signal or we must have been
|
|
|
|
* out of queue space. So zero out the info.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
|
|
|
info->si_signo = sig;
|
|
|
|
info->si_errno = 0;
|
2009-12-16 07:47:24 +07:00
|
|
|
info->si_code = SI_USER;
|
2005-04-17 05:20:36 +07:00
|
|
|
info->si_pid = 0;
|
|
|
|
info->si_uid = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
|
|
|
|
siginfo_t *info)
|
|
|
|
{
|
2006-09-29 16:00:31 +07:00
|
|
|
int sig = next_signal(pending, mask);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (sig) {
|
|
|
|
if (current->notifier) {
|
|
|
|
if (sigismember(current->notifier_mask, sig)) {
|
|
|
|
if (!(current->notifier)(current->notifier_data)) {
|
|
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-25 15:47:29 +07:00
|
|
|
collect_signal(sig, pending, info);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return sig;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2011-04-05 04:59:31 +07:00
|
|
|
* Dequeue a signal and return the element to the caller, which is
|
2005-04-17 05:20:36 +07:00
|
|
|
* expected to free it.
|
|
|
|
*
|
|
|
|
* All callers have to hold the siglock.
|
|
|
|
*/
|
|
|
|
int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
|
|
|
|
{
|
2008-04-30 14:52:40 +07:00
|
|
|
int signr;
|
2007-06-12 05:16:18 +07:00
|
|
|
|
|
|
|
/* We only dequeue private signals from ourselves, we don't let
|
|
|
|
* signalfd steal them
|
|
|
|
*/
|
2007-09-21 02:40:16 +07:00
|
|
|
signr = __dequeue_signal(&tsk->pending, mask, info);
|
2007-02-16 16:28:12 +07:00
|
|
|
if (!signr) {
|
2005-04-17 05:20:36 +07:00
|
|
|
signr = __dequeue_signal(&tsk->signal->shared_pending,
|
|
|
|
mask, info);
|
2007-02-16 16:28:12 +07:00
|
|
|
/*
|
|
|
|
* itimer signal ?
|
|
|
|
*
|
|
|
|
* itimers are process shared and we restart periodic
|
|
|
|
* itimers in the signal delivery path to prevent DoS
|
|
|
|
* attacks in the high resolution timer case. This is
|
2011-04-05 04:59:31 +07:00
|
|
|
* compliant with the old way of self-restarting
|
2007-02-16 16:28:12 +07:00
|
|
|
* itimers, as the SIGALRM is a legacy signal and only
|
|
|
|
* queued once. Changing the restart behaviour to
|
|
|
|
* restart the timer in the signal dequeue path is
|
|
|
|
* reducing the timer noise on heavy loaded !highres
|
|
|
|
* systems too.
|
|
|
|
*/
|
|
|
|
if (unlikely(signr == SIGALRM)) {
|
|
|
|
struct hrtimer *tmr = &tsk->signal->real_timer;
|
|
|
|
|
|
|
|
if (!hrtimer_is_queued(tmr) &&
|
|
|
|
tsk->signal->it_real_incr.tv64 != 0) {
|
|
|
|
hrtimer_forward(tmr, tmr->base->get_time(),
|
|
|
|
tsk->signal->it_real_incr);
|
|
|
|
hrtimer_restart(tmr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-04-30 14:52:40 +07:00
|
|
|
|
2007-09-21 02:40:16 +07:00
|
|
|
recalc_sigpending();
|
2008-04-30 14:52:40 +07:00
|
|
|
if (!signr)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(sig_kernel_stop(signr))) {
|
2007-02-16 16:28:12 +07:00
|
|
|
/*
|
|
|
|
* Set a marker that we have dequeued a stop signal. Our
|
|
|
|
* caller might release the siglock and then the pending
|
|
|
|
* stop signal it is about to process is no longer in the
|
|
|
|
* pending bitmasks, but must still be cleared by a SIGCONT
|
|
|
|
* (and overruled by a SIGKILL). So those cases clear this
|
|
|
|
* shared flag after we've set it. Note that this flag may
|
|
|
|
* remain set after the signal we return is ignored or
|
|
|
|
* handled. That doesn't matter because its only purpose
|
|
|
|
* is to alert stop-signal processing code when another
|
|
|
|
* processor has come along and cleared the flag.
|
|
|
|
*/
|
2011-06-02 16:13:59 +07:00
|
|
|
current->jobctl |= JOBCTL_STOP_DEQUEUED;
|
2007-02-16 16:28:12 +07:00
|
|
|
}
|
2008-04-30 14:52:40 +07:00
|
|
|
if ((info->si_code & __SI_MASK) == __SI_TIMER && info->si_sys_private) {
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Release the siglock to ensure proper locking order
|
|
|
|
* of timer locks outside of siglocks. Note, we leave
|
|
|
|
* irqs disabled here, since the posix-timers code is
|
|
|
|
* about to disable them again anyway.
|
|
|
|
*/
|
|
|
|
spin_unlock(&tsk->sighand->siglock);
|
|
|
|
do_schedule_next_timer(info);
|
|
|
|
spin_lock(&tsk->sighand->siglock);
|
|
|
|
}
|
|
|
|
return signr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tell a process that it has a new active signal..
|
|
|
|
*
|
|
|
|
* NOTE! we rely on the previous spin_lock to
|
|
|
|
* lock interrupts for us! We can only be called with
|
|
|
|
* "siglock" held, and the local interrupt must
|
|
|
|
* have been disabled when that got acquired!
|
|
|
|
*
|
|
|
|
* No need to set need_resched since signal event passing
|
|
|
|
* goes through ->blocked
|
|
|
|
*/
|
2013-01-22 02:47:41 +07:00
|
|
|
void signal_wake_up_state(struct task_struct *t, unsigned int state)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
set_tsk_thread_flag(t, TIF_SIGPENDING);
|
|
|
|
/*
|
2013-01-22 02:47:41 +07:00
|
|
|
* TASK_WAKEKILL also means wake it up in the stopped/traced/killable
|
2007-12-06 23:13:16 +07:00
|
|
|
* case. We don't check t->state here because there is a race with it
|
2005-04-17 05:20:36 +07:00
|
|
|
* executing another processor and just now entering stopped state.
|
|
|
|
* By using wake_up_state, we ensure the process will wake up and
|
|
|
|
* handle its death signal.
|
|
|
|
*/
|
2013-01-22 02:47:41 +07:00
|
|
|
if (!wake_up_state(t, state | TASK_INTERRUPTIBLE))
|
2005-04-17 05:20:36 +07:00
|
|
|
kick_process(t);
|
|
|
|
}
|
|
|
|
|
2006-01-08 16:02:48 +07:00
|
|
|
/*
|
|
|
|
* Remove signals in mask from the pending set and queue.
|
|
|
|
* Returns 1 if any signals were found.
|
|
|
|
*
|
|
|
|
* All callers must be holding the siglock.
|
|
|
|
*
|
|
|
|
* This version takes a sigset mask and looks at all signals,
|
|
|
|
* not just those in the first mask word.
|
|
|
|
*/
|
|
|
|
static int rm_from_queue_full(sigset_t *mask, struct sigpending *s)
|
|
|
|
{
|
|
|
|
struct sigqueue *q, *n;
|
|
|
|
sigset_t m;
|
|
|
|
|
|
|
|
sigandsets(&m, mask, &s->signal);
|
|
|
|
if (sigisemptyset(&m))
|
|
|
|
return 0;
|
|
|
|
|
2011-04-28 03:01:27 +07:00
|
|
|
sigandnsets(&s->signal, &s->signal, mask);
|
2006-01-08 16:02:48 +07:00
|
|
|
list_for_each_entry_safe(q, n, &s->list, list) {
|
|
|
|
if (sigismember(mask, q->info.si_signo)) {
|
|
|
|
list_del_init(&q->list);
|
|
|
|
__sigqueue_free(q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Remove signals in mask from the pending set and queue.
|
|
|
|
* Returns 1 if any signals were found.
|
|
|
|
*
|
|
|
|
* All callers must be holding the siglock.
|
|
|
|
*/
|
|
|
|
static int rm_from_queue(unsigned long mask, struct sigpending *s)
|
|
|
|
{
|
|
|
|
struct sigqueue *q, *n;
|
|
|
|
|
|
|
|
if (!sigtestsetmask(&s->signal, mask))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
sigdelsetmask(&s->signal, mask);
|
|
|
|
list_for_each_entry_safe(q, n, &s->list, list) {
|
|
|
|
if (q->info.si_signo < SIGRTMIN &&
|
|
|
|
(mask & sigmask(q->info.si_signo))) {
|
|
|
|
list_del_init(&q->list);
|
|
|
|
__sigqueue_free(q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-12-16 07:47:22 +07:00
|
|
|
static inline int is_si_special(const struct siginfo *info)
|
|
|
|
{
|
|
|
|
return info <= SEND_SIG_FORCED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool si_fromuser(const struct siginfo *info)
|
|
|
|
{
|
|
|
|
return info == SEND_SIG_NOINFO ||
|
|
|
|
(!is_si_special(info) && SI_FROMUSER(info));
|
|
|
|
}
|
|
|
|
|
2011-03-24 06:43:19 +07:00
|
|
|
/*
|
|
|
|
* called with RCU read lock from check_kill_permission()
|
|
|
|
*/
|
|
|
|
static int kill_ok_by_cred(struct task_struct *t)
|
|
|
|
{
|
|
|
|
const struct cred *cred = current_cred();
|
|
|
|
const struct cred *tcred = __task_cred(t);
|
|
|
|
|
2012-03-04 11:21:47 +07:00
|
|
|
if (uid_eq(cred->euid, tcred->suid) ||
|
|
|
|
uid_eq(cred->euid, tcred->uid) ||
|
|
|
|
uid_eq(cred->uid, tcred->suid) ||
|
|
|
|
uid_eq(cred->uid, tcred->uid))
|
2011-03-24 06:43:19 +07:00
|
|
|
return 1;
|
|
|
|
|
2011-11-17 14:15:31 +07:00
|
|
|
if (ns_capable(tcred->user_ns, CAP_KILL))
|
2011-03-24 06:43:19 +07:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Bad permissions for sending the signal
|
2010-08-04 22:59:14 +07:00
|
|
|
* - the caller must hold the RCU read lock
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
|
|
|
static int check_kill_permission(int sig, struct siginfo *info,
|
|
|
|
struct task_struct *t)
|
|
|
|
{
|
2008-04-30 14:53:01 +07:00
|
|
|
struct pid *sid;
|
2008-04-30 14:52:42 +07:00
|
|
|
int error;
|
|
|
|
|
2005-05-01 22:59:14 +07:00
|
|
|
if (!valid_signal(sig))
|
2008-04-30 14:52:42 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2009-12-16 07:47:22 +07:00
|
|
|
if (!si_fromuser(info))
|
2008-04-30 14:52:42 +07:00
|
|
|
return 0;
|
2007-03-30 05:01:04 +07:00
|
|
|
|
2008-04-30 14:52:42 +07:00
|
|
|
error = audit_signal_info(sig, t); /* Let audit system see the signal */
|
|
|
|
if (error)
|
2005-04-17 05:20:36 +07:00
|
|
|
return error;
|
2008-04-30 14:52:42 +07:00
|
|
|
|
2010-05-27 04:42:54 +07:00
|
|
|
if (!same_thread_group(current, t) &&
|
2011-03-24 06:43:19 +07:00
|
|
|
!kill_ok_by_cred(t)) {
|
2008-04-30 14:53:01 +07:00
|
|
|
switch (sig) {
|
|
|
|
case SIGCONT:
|
|
|
|
sid = task_session(t);
|
|
|
|
/*
|
|
|
|
* We don't return the error if sid == NULL. The
|
|
|
|
* task was unhashed, the caller must notice this.
|
|
|
|
*/
|
|
|
|
if (!sid || sid == task_session(current))
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EPERM;
|
|
|
|
}
|
|
|
|
}
|
2005-05-06 18:38:39 +07:00
|
|
|
|
2007-03-30 05:01:04 +07:00
|
|
|
return security_task_kill(t, info, sig, 0);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
/**
|
|
|
|
* ptrace_trap_notify - schedule trap to notify ptracer
|
|
|
|
* @t: tracee wanting to notify tracer
|
|
|
|
*
|
|
|
|
* This function schedules sticky ptrace trap which is cleared on the next
|
|
|
|
* TRAP_STOP to notify ptracer of an event. @t must have been seized by
|
|
|
|
* ptracer.
|
|
|
|
*
|
ptrace: implement PTRACE_LISTEN
The previous patch implemented async notification for ptrace but it
only worked while trace is running. This patch introduces
PTRACE_LISTEN which is suggested by Oleg Nestrov.
It's allowed iff tracee is in STOP trap and puts tracee into
quasi-running state - tracee never really runs but wait(2) and
ptrace(2) consider it to be running. While ptracer is listening,
tracee is allowed to re-enter STOP to notify an async event.
Listening state is cleared on the first notification. Ptracer can
also clear it by issuing INTERRUPT - tracee will re-trap into STOP
with listening state cleared.
This allows ptracer to monitor group stop state without running tracee
- use INTERRUPT to put tracee into STOP trap, issue LISTEN and then
wait(2) to wait for the next group stop event. When it happens,
PTRACE_GETSIGINFO provides information to determine the current state.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_LISTEN 0x4208
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
if (si.si_signo != SIGTRAP)
ptrace(PTRACE_LISTEN, tracee, NULL, NULL);
else
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
This is identical to the program to test TRAP_NOTIFY except that
tracee is PTRACE_LISTEN'd instead of PTRACE_CONT'd when group stopped.
This allows ptracer to monitor when group stop ends without running
tracee.
# ./test-listen
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
-v2: Moved JOBCTL_LISTENING check in wait_task_stopped() into
task_stopped_code() as suggested by Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:18 +07:00
|
|
|
* If @t is running, STOP trap will be taken. If trapped for STOP and
|
|
|
|
* ptracer is listening for events, tracee is woken up so that it can
|
|
|
|
* re-trap for the new event. If trapped otherwise, STOP trap will be
|
|
|
|
* eventually taken without returning to userland after the existing traps
|
|
|
|
* are finished by PTRACE_CONT.
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @task->sighand->siglock held.
|
|
|
|
*/
|
|
|
|
static void ptrace_trap_notify(struct task_struct *t)
|
|
|
|
{
|
|
|
|
WARN_ON_ONCE(!(t->ptrace & PT_SEIZED));
|
|
|
|
assert_spin_locked(&t->sighand->siglock);
|
|
|
|
|
|
|
|
task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY);
|
2013-01-22 02:47:41 +07:00
|
|
|
ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
2008-04-30 14:52:59 +07:00
|
|
|
* Handle magic process-wide effects of stop/continue signals. Unlike
|
|
|
|
* the signal actions, these happen immediately at signal-generation
|
2005-04-17 05:20:36 +07:00
|
|
|
* time regardless of blocking, ignoring, or handling. This does the
|
|
|
|
* actual continuing for SIGCONT, but not the actual stopping for stop
|
2008-04-30 14:52:59 +07:00
|
|
|
* signals. The process stop is done as a signal action for SIG_DFL.
|
|
|
|
*
|
|
|
|
* Returns true if the signal should be actually delivered, otherwise
|
|
|
|
* it should be dropped.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2013-05-01 05:28:10 +07:00
|
|
|
static bool prepare_signal(int sig, struct task_struct *p, bool force)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-04-30 14:52:46 +07:00
|
|
|
struct signal_struct *signal = p->signal;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct task_struct *t;
|
|
|
|
|
2013-05-01 05:28:10 +07:00
|
|
|
if (signal->flags & (SIGNAL_GROUP_EXIT | SIGNAL_GROUP_COREDUMP)) {
|
|
|
|
if (signal->flags & SIGNAL_GROUP_COREDUMP)
|
|
|
|
return sig == SIGKILL;
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
2008-04-30 14:52:59 +07:00
|
|
|
* The process is in the middle of dying, nothing to do.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2008-04-30 14:52:59 +07:00
|
|
|
} else if (sig_kernel_stop(sig)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* This is a stop signal. Remove SIGCONT from all queues.
|
|
|
|
*/
|
2008-04-30 14:52:46 +07:00
|
|
|
rm_from_queue(sigmask(SIGCONT), &signal->shared_pending);
|
2005-04-17 05:20:36 +07:00
|
|
|
t = p;
|
|
|
|
do {
|
|
|
|
rm_from_queue(sigmask(SIGCONT), &t->pending);
|
2008-04-30 14:52:46 +07:00
|
|
|
} while_each_thread(p, t);
|
2005-04-17 05:20:36 +07:00
|
|
|
} else if (sig == SIGCONT) {
|
2008-04-30 14:52:46 +07:00
|
|
|
unsigned int why;
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
signal: prepare_signal(SIGCONT) shouldn't play with TIF_SIGPENDING
prepare_signal(SIGCONT) should never set TIF_SIGPENDING or wake up
the TASK_INTERRUPTIBLE threads. We are going to call complete_signal()
which should pick the right thread correctly. All we need is to wake
up the TASK_STOPPED threads.
If the task was stopped, it can't return to usermode without taking
->siglock. Otherwise we don't care, and the spurious TIF_SIGPENDING
can't be useful.
The comment says:
* If there is a handler for SIGCONT, we must make
* sure that no thread returns to user mode before
* we post the signal
It is not clear what this means. Probably, "when there's only a single
thread" and this continues to be true. Otherwise, even if this SIGCONT
is not private, with or without this change only one thread can dequeue
SIGCONT, other threads can happily return to user mode before before
that thread handles this signal.
Note also that wake_up_state(t, __TASK_STOPPED) can't race with the task
which changes its state, TASK_STOPPED state is protected by ->siglock as
well.
In short: when it comes to signal delivery, SIGCONT is the normal signal
and does not need any special support.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2011-04-02 01:11:50 +07:00
|
|
|
* Remove all stop signals from all queues, wake all threads.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2008-04-30 14:52:46 +07:00
|
|
|
rm_from_queue(SIG_KERNEL_STOP_MASK, &signal->shared_pending);
|
2005-04-17 05:20:36 +07:00
|
|
|
t = p;
|
|
|
|
do {
|
2011-06-02 16:14:00 +07:00
|
|
|
task_clear_jobctl_pending(t, JOBCTL_STOP_PENDING);
|
2005-04-17 05:20:36 +07:00
|
|
|
rm_from_queue(SIG_KERNEL_STOP_MASK, &t->pending);
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
if (likely(!(t->ptrace & PT_SEIZED)))
|
|
|
|
wake_up_state(t, __TASK_STOPPED);
|
|
|
|
else
|
|
|
|
ptrace_trap_notify(t);
|
2008-04-30 14:52:46 +07:00
|
|
|
} while_each_thread(p, t);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:52:46 +07:00
|
|
|
/*
|
|
|
|
* Notify the parent with CLD_CONTINUED if we were stopped.
|
|
|
|
*
|
|
|
|
* If we were in the middle of a group stop, we pretend it
|
|
|
|
* was already finished, and then continued. Since SIGCHLD
|
|
|
|
* doesn't queue we report only CLD_STOPPED, as if the next
|
|
|
|
* CLD_CONTINUED was dropped.
|
|
|
|
*/
|
|
|
|
why = 0;
|
2008-04-30 14:52:46 +07:00
|
|
|
if (signal->flags & SIGNAL_STOP_STOPPED)
|
2008-04-30 14:52:46 +07:00
|
|
|
why |= SIGNAL_CLD_CONTINUED;
|
2008-04-30 14:52:46 +07:00
|
|
|
else if (signal->group_stop_count)
|
2008-04-30 14:52:46 +07:00
|
|
|
why |= SIGNAL_CLD_STOPPED;
|
|
|
|
|
|
|
|
if (why) {
|
2008-04-30 14:53:00 +07:00
|
|
|
/*
|
2009-09-24 05:56:53 +07:00
|
|
|
* The first thread which returns from do_signal_stop()
|
2008-04-30 14:53:00 +07:00
|
|
|
* will take ->siglock, notice SIGNAL_CLD_MASK, and
|
|
|
|
* notify its parent. See get_signal_to_deliver().
|
|
|
|
*/
|
2008-04-30 14:52:46 +07:00
|
|
|
signal->flags = why | SIGNAL_STOP_CONTINUED;
|
|
|
|
signal->group_stop_count = 0;
|
|
|
|
signal->group_exit_code = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
2008-04-30 14:52:59 +07:00
|
|
|
|
2012-03-24 05:02:45 +07:00
|
|
|
return !sig_ignored(p, sig, force);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-04-30 14:52:53 +07:00
|
|
|
/*
|
|
|
|
* Test if P wants to take SIG. After we've checked all threads with this,
|
|
|
|
* it's equivalent to finding no threads not blocking SIG. Any threads not
|
|
|
|
* blocking SIG were ruled out because they are not running and already
|
|
|
|
* have pending signals. Such threads will dequeue from the shared queue
|
|
|
|
* as soon as they're available, so putting the signal on the shared queue
|
|
|
|
* will be equivalent to sending it to one such thread.
|
|
|
|
*/
|
|
|
|
static inline int wants_signal(int sig, struct task_struct *p)
|
|
|
|
{
|
|
|
|
if (sigismember(&p->blocked, sig))
|
|
|
|
return 0;
|
|
|
|
if (p->flags & PF_EXITING)
|
|
|
|
return 0;
|
|
|
|
if (sig == SIGKILL)
|
|
|
|
return 1;
|
|
|
|
if (task_is_stopped_or_traced(p))
|
|
|
|
return 0;
|
|
|
|
return task_curr(p) || !signal_pending(p);
|
|
|
|
}
|
|
|
|
|
2008-04-30 14:52:55 +07:00
|
|
|
static void complete_signal(int sig, struct task_struct *p, int group)
|
2008-04-30 14:52:53 +07:00
|
|
|
{
|
|
|
|
struct signal_struct *signal = p->signal;
|
|
|
|
struct task_struct *t;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now find a thread we can wake up to take the signal off the queue.
|
|
|
|
*
|
|
|
|
* If the main thread wants the signal, it gets first crack.
|
|
|
|
* Probably the least surprising to the average bear.
|
|
|
|
*/
|
|
|
|
if (wants_signal(sig, p))
|
|
|
|
t = p;
|
2008-04-30 14:52:55 +07:00
|
|
|
else if (!group || thread_group_empty(p))
|
2008-04-30 14:52:53 +07:00
|
|
|
/*
|
|
|
|
* There is just one thread and it does not need to be woken.
|
|
|
|
* It will dequeue unblocked signals before it runs again.
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* Otherwise try to find a suitable thread.
|
|
|
|
*/
|
|
|
|
t = signal->curr_target;
|
|
|
|
while (!wants_signal(sig, t)) {
|
|
|
|
t = next_thread(t);
|
|
|
|
if (t == signal->curr_target)
|
|
|
|
/*
|
|
|
|
* No thread needs to be woken.
|
|
|
|
* Any eligible threads will see
|
|
|
|
* the signal in the queue soon.
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
signal->curr_target = t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Found a killable thread. If the signal will be fatal,
|
|
|
|
* then start taking the whole group down immediately.
|
|
|
|
*/
|
2008-04-30 14:53:03 +07:00
|
|
|
if (sig_fatal(p, sig) &&
|
|
|
|
!(signal->flags & (SIGNAL_UNKILLABLE | SIGNAL_GROUP_EXIT)) &&
|
2008-04-30 14:52:53 +07:00
|
|
|
!sigismember(&t->real_blocked, sig) &&
|
2011-06-17 21:50:37 +07:00
|
|
|
(sig == SIGKILL || !t->ptrace)) {
|
2008-04-30 14:52:53 +07:00
|
|
|
/*
|
|
|
|
* This signal will be fatal to the whole group.
|
|
|
|
*/
|
|
|
|
if (!sig_kernel_coredump(sig)) {
|
|
|
|
/*
|
|
|
|
* Start a group exit and wake everybody up.
|
|
|
|
* This way we don't have other threads
|
|
|
|
* running and doing things after a slower
|
|
|
|
* thread has the fatal signal pending.
|
|
|
|
*/
|
|
|
|
signal->flags = SIGNAL_GROUP_EXIT;
|
|
|
|
signal->group_exit_code = sig;
|
|
|
|
signal->group_stop_count = 0;
|
|
|
|
t = p;
|
|
|
|
do {
|
2011-06-02 16:14:00 +07:00
|
|
|
task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
|
2008-04-30 14:52:53 +07:00
|
|
|
sigaddset(&t->pending.signal, SIGKILL);
|
|
|
|
signal_wake_up(t, 1);
|
|
|
|
} while_each_thread(p, t);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The signal is already in the shared-pending queue.
|
|
|
|
* Tell the chosen thread to wake up and dequeue it.
|
|
|
|
*/
|
|
|
|
signal_wake_up(t, sig == SIGKILL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-04-30 14:52:34 +07:00
|
|
|
static inline int legacy_queue(struct sigpending *signals, int sig)
|
|
|
|
{
|
|
|
|
return (sig < SIGRTMIN) && sigismember(&signals->signal, sig);
|
|
|
|
}
|
|
|
|
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
#ifdef CONFIG_USER_NS
|
|
|
|
static inline void userns_fixup_signal_uid(struct siginfo *info, struct task_struct *t)
|
|
|
|
{
|
|
|
|
if (current_user_ns() == task_cred_xxx(t, user_ns))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (SI_FROMKERNEL(info))
|
|
|
|
return;
|
|
|
|
|
2012-02-08 22:00:08 +07:00
|
|
|
rcu_read_lock();
|
|
|
|
info->si_uid = from_kuid_munged(task_cred_xxx(t, user_ns),
|
|
|
|
make_kuid(current_user_ns(), info->si_uid));
|
|
|
|
rcu_read_unlock();
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void userns_fixup_signal_uid(struct siginfo *info, struct task_struct *t)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-04-03 06:58:04 +07:00
|
|
|
static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
|
|
|
|
int group, int from_ancestor_ns)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-04-30 14:52:54 +07:00
|
|
|
struct sigpending *pending;
|
2008-04-30 14:52:50 +07:00
|
|
|
struct sigqueue *q;
|
2009-05-16 16:28:33 +07:00
|
|
|
int override_rlimit;
|
2011-11-23 03:13:48 +07:00
|
|
|
int ret = 0, result;
|
tracing, sched: LTTng instrumentation - scheduler
Instrument the scheduler activity (sched_switch, migration, wakeups,
wait for a task, signal delivery) and process/thread
creation/destruction (fork, exit, kthread stop). Actually, kthread
creation is not instrumented in this patch because it is architecture
dependent. It allows to connect tracers such as ftrace which detects
scheduling latencies, good/bad scheduler decisions. Tools like LTTng can
export this scheduler information along with instrumentation of the rest
of the kernel activity to perform post-mortem analysis on the scheduler
activity.
About the performance impact of tracepoints (which is comparable to
markers), even without immediate values optimizations, tests done by
Hideo Aoki on ia64 show no regression. His test case was using hackbench
on a kernel where scheduler instrumentation (about 5 events in code
scheduler code) was added. See the "Tracepoints" patch header for
performance result detail.
Changelog :
- Change instrumentation location and parameter to match ftrace
instrumentation, previously done with kernel markers.
[ mingo@elte.hu: conflict resolutions ]
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: 'Peter Zijlstra' <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-18 23:16:17 +07:00
|
|
|
|
2008-04-30 14:52:50 +07:00
|
|
|
assert_spin_locked(&t->sighand->siglock);
|
2009-04-03 06:58:05 +07:00
|
|
|
|
2011-11-23 03:13:48 +07:00
|
|
|
result = TRACE_SIGNAL_IGNORED;
|
2012-03-24 05:02:44 +07:00
|
|
|
if (!prepare_signal(sig, t,
|
|
|
|
from_ancestor_ns || (info == SEND_SIG_FORCED)))
|
2011-11-23 03:13:48 +07:00
|
|
|
goto ret;
|
2008-04-30 14:52:54 +07:00
|
|
|
|
|
|
|
pending = group ? &t->signal->shared_pending : &t->pending;
|
2008-04-30 14:52:35 +07:00
|
|
|
/*
|
|
|
|
* Short-circuit ignored signals and support queuing
|
|
|
|
* exactly one non-rt signal, so that we can get more
|
|
|
|
* detailed information about the cause of the signal.
|
|
|
|
*/
|
2011-11-23 03:13:48 +07:00
|
|
|
result = TRACE_SIGNAL_ALREADY_PENDING;
|
2008-04-30 14:52:59 +07:00
|
|
|
if (legacy_queue(pending, sig))
|
2011-11-23 03:13:48 +07:00
|
|
|
goto ret;
|
|
|
|
|
|
|
|
result = TRACE_SIGNAL_DELIVERED;
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* fast-pathed signals for kernel-internal things like SIGSTOP
|
|
|
|
* or SIGKILL.
|
|
|
|
*/
|
2005-10-31 06:03:44 +07:00
|
|
|
if (info == SEND_SIG_FORCED)
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out_set;
|
|
|
|
|
2011-04-05 04:59:31 +07:00
|
|
|
/*
|
|
|
|
* Real-time signals must be queued if sent by sigqueue, or
|
|
|
|
* some other real-time mechanism. It is implementation
|
|
|
|
* defined whether kill() does so. We attempt to do so, on
|
|
|
|
* the principle of least surprise, but since kill is not
|
|
|
|
* allowed to fail with EAGAIN when low on memory we just
|
|
|
|
* make sure at least one signal gets delivered and don't
|
|
|
|
* pass on the info struct.
|
|
|
|
*/
|
2009-05-16 16:28:33 +07:00
|
|
|
if (sig < SIGRTMIN)
|
|
|
|
override_rlimit = (is_si_special(info) || info->si_code >= 0);
|
|
|
|
else
|
|
|
|
override_rlimit = 0;
|
|
|
|
|
2009-11-08 22:46:42 +07:00
|
|
|
q = __sigqueue_alloc(sig, t, GFP_ATOMIC | __GFP_NOTRACK_FALSE_POSITIVE,
|
2009-05-16 16:28:33 +07:00
|
|
|
override_rlimit);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (q) {
|
2008-04-30 14:52:54 +07:00
|
|
|
list_add_tail(&q->list, &pending->list);
|
2005-04-17 05:20:36 +07:00
|
|
|
switch ((unsigned long) info) {
|
2005-10-31 06:03:44 +07:00
|
|
|
case (unsigned long) SEND_SIG_NOINFO:
|
2005-04-17 05:20:36 +07:00
|
|
|
q->info.si_signo = sig;
|
|
|
|
q->info.si_errno = 0;
|
|
|
|
q->info.si_code = SI_USER;
|
2009-01-07 05:42:46 +07:00
|
|
|
q->info.si_pid = task_tgid_nr_ns(current,
|
2009-01-07 05:42:45 +07:00
|
|
|
task_active_pid_ns(t));
|
2012-02-08 22:00:08 +07:00
|
|
|
q->info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
2005-10-31 06:03:44 +07:00
|
|
|
case (unsigned long) SEND_SIG_PRIV:
|
2005-04-17 05:20:36 +07:00
|
|
|
q->info.si_signo = sig;
|
|
|
|
q->info.si_errno = 0;
|
|
|
|
q->info.si_code = SI_KERNEL;
|
|
|
|
q->info.si_pid = 0;
|
|
|
|
q->info.si_uid = 0;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
copy_siginfo(&q->info, info);
|
2009-04-03 06:58:09 +07:00
|
|
|
if (from_ancestor_ns)
|
|
|
|
q->info.si_pid = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
|
|
|
|
userns_fixup_signal_uid(&q->info, t);
|
|
|
|
|
2005-10-31 06:03:45 +07:00
|
|
|
} else if (!is_si_special(info)) {
|
2009-11-25 04:56:58 +07:00
|
|
|
if (sig >= SIGRTMIN && info->si_code != SI_USER) {
|
|
|
|
/*
|
|
|
|
* Queue overflow, abort. We may abort if the
|
|
|
|
* signal was rt and sent by user using something
|
|
|
|
* other than kill().
|
|
|
|
*/
|
2011-11-23 03:13:48 +07:00
|
|
|
result = TRACE_SIGNAL_OVERFLOW_FAIL;
|
|
|
|
ret = -EAGAIN;
|
|
|
|
goto ret;
|
2009-11-25 04:56:58 +07:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* This is a silent loss of information. We still
|
|
|
|
* send the signal, but the *info bits are lost.
|
|
|
|
*/
|
2011-11-23 03:13:48 +07:00
|
|
|
result = TRACE_SIGNAL_LOSE_INFO;
|
2009-11-25 04:56:58 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
out_set:
|
2008-04-30 14:53:00 +07:00
|
|
|
signalfd_notify(t, sig);
|
2008-04-30 14:52:54 +07:00
|
|
|
sigaddset(&pending->signal, sig);
|
2008-04-30 14:52:55 +07:00
|
|
|
complete_signal(sig, t, group);
|
2011-11-23 03:13:48 +07:00
|
|
|
ret:
|
|
|
|
trace_signal_generate(sig, info, t, group, result);
|
|
|
|
return ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2009-04-03 06:58:04 +07:00
|
|
|
static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
|
|
|
|
int group)
|
|
|
|
{
|
2009-04-03 06:58:05 +07:00
|
|
|
int from_ancestor_ns = 0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_PID_NS
|
2009-12-16 07:47:24 +07:00
|
|
|
from_ancestor_ns = si_fromuser(info) &&
|
|
|
|
!task_pid_nr_ns(current, task_active_pid_ns(t));
|
2009-04-03 06:58:05 +07:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return __send_signal(sig, info, t, group, from_ancestor_ns);
|
2009-04-03 06:58:04 +07:00
|
|
|
}
|
|
|
|
|
2012-11-06 01:09:56 +07:00
|
|
|
static void print_fatal_signal(int signr)
|
2007-07-16 13:40:10 +07:00
|
|
|
{
|
2012-11-06 01:09:56 +07:00
|
|
|
struct pt_regs *regs = signal_pt_regs();
|
2013-05-01 05:27:19 +07:00
|
|
|
printk(KERN_INFO "potentially unexpected fatal signal %d.\n", signr);
|
2007-07-16 13:40:10 +07:00
|
|
|
|
2007-10-29 11:31:16 +07:00
|
|
|
#if defined(__i386__) && !defined(__arch_um__)
|
2013-02-28 08:03:13 +07:00
|
|
|
printk(KERN_INFO "code at %08lx: ", regs->ip);
|
2007-07-16 13:40:10 +07:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
|
|
unsigned char insn;
|
|
|
|
|
2010-01-09 05:42:52 +07:00
|
|
|
if (get_user(insn, (unsigned char *)(regs->ip + i)))
|
|
|
|
break;
|
2013-02-28 08:03:13 +07:00
|
|
|
printk(KERN_CONT "%02x ", insn);
|
2007-07-16 13:40:10 +07:00
|
|
|
}
|
|
|
|
}
|
2013-02-28 08:03:13 +07:00
|
|
|
printk(KERN_CONT "\n");
|
2007-07-16 13:40:10 +07:00
|
|
|
#endif
|
2009-01-27 06:33:31 +07:00
|
|
|
preempt_disable();
|
2007-07-16 13:40:10 +07:00
|
|
|
show_regs(regs);
|
2009-01-27 06:33:31 +07:00
|
|
|
preempt_enable();
|
2007-07-16 13:40:10 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init setup_print_fatal_signals(char *str)
|
|
|
|
{
|
|
|
|
get_option (&str, &print_fatal_signals);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
__setup("print-fatal-signals=", setup_print_fatal_signals);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:52:55 +07:00
|
|
|
int
|
|
|
|
__group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
|
|
|
|
{
|
|
|
|
return send_signal(sig, info, p, 1);
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int
|
|
|
|
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
|
|
|
|
{
|
2008-04-30 14:52:55 +07:00
|
|
|
return send_signal(sig, info, t, 0);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2009-09-24 05:57:00 +07:00
|
|
|
int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
|
|
|
|
bool group)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int ret = -ESRCH;
|
|
|
|
|
|
|
|
if (lock_task_sighand(p, &flags)) {
|
|
|
|
ret = send_signal(sig, info, p, group);
|
|
|
|
unlock_task_sighand(p, &flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Force a signal that the process can't ignore: if necessary
|
|
|
|
* we unblock the signal and change any SIG_IGN to SIG_DFL.
|
2006-08-03 10:17:49 +07:00
|
|
|
*
|
|
|
|
* Note: If we unblock the signal, we always reset it to SIG_DFL,
|
|
|
|
* since we do not want to have a signal handler that was blocked
|
|
|
|
* be invoked when user space had explicitly blocked it.
|
|
|
|
*
|
2008-04-30 14:53:05 +07:00
|
|
|
* We don't want to have recursive SIGSEGV's etc, for example,
|
|
|
|
* that is why we also clear SIGNAL_UNKILLABLE.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
|
|
|
|
{
|
|
|
|
unsigned long int flags;
|
2006-08-03 10:17:49 +07:00
|
|
|
int ret, blocked, ignored;
|
|
|
|
struct k_sigaction *action;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
spin_lock_irqsave(&t->sighand->siglock, flags);
|
2006-08-03 10:17:49 +07:00
|
|
|
action = &t->sighand->action[sig-1];
|
|
|
|
ignored = action->sa.sa_handler == SIG_IGN;
|
|
|
|
blocked = sigismember(&t->blocked, sig);
|
|
|
|
if (blocked || ignored) {
|
|
|
|
action->sa.sa_handler = SIG_DFL;
|
|
|
|
if (blocked) {
|
|
|
|
sigdelset(&t->blocked, sig);
|
2007-05-24 03:57:44 +07:00
|
|
|
recalc_sigpending_and_wake(t);
|
2006-08-03 10:17:49 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2008-04-30 14:53:05 +07:00
|
|
|
if (action->sa.sa_handler == SIG_DFL)
|
|
|
|
t->signal->flags &= ~SIGNAL_UNKILLABLE;
|
2005-04-17 05:20:36 +07:00
|
|
|
ret = specific_send_sig_info(sig, info, t);
|
|
|
|
spin_unlock_irqrestore(&t->sighand->siglock, flags);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Nuke all other threads in the group.
|
|
|
|
*/
|
2010-05-27 04:43:11 +07:00
|
|
|
int zap_other_threads(struct task_struct *p)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-05-27 04:43:11 +07:00
|
|
|
struct task_struct *t = p;
|
|
|
|
int count = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
p->signal->group_stop_count = 0;
|
|
|
|
|
2010-05-27 04:43:11 +07:00
|
|
|
while_each_thread(p, t) {
|
2011-06-02 16:14:00 +07:00
|
|
|
task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
|
2010-05-27 04:43:11 +07:00
|
|
|
count++;
|
|
|
|
|
|
|
|
/* Don't bother with already dead threads */
|
2005-04-17 05:20:36 +07:00
|
|
|
if (t->exit_state)
|
|
|
|
continue;
|
|
|
|
sigaddset(&t->pending.signal, SIGKILL);
|
|
|
|
signal_wake_up(t, 1);
|
|
|
|
}
|
2010-05-27 04:43:11 +07:00
|
|
|
|
|
|
|
return count;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2010-10-28 05:34:06 +07:00
|
|
|
struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
|
|
|
|
unsigned long *flags)
|
2006-03-29 07:11:13 +07:00
|
|
|
{
|
|
|
|
struct sighand_struct *sighand;
|
|
|
|
|
|
|
|
for (;;) {
|
2011-07-19 17:25:36 +07:00
|
|
|
local_irq_save(*flags);
|
|
|
|
rcu_read_lock();
|
2006-03-29 07:11:13 +07:00
|
|
|
sighand = rcu_dereference(tsk->sighand);
|
2011-07-19 17:25:36 +07:00
|
|
|
if (unlikely(sighand == NULL)) {
|
|
|
|
rcu_read_unlock();
|
|
|
|
local_irq_restore(*flags);
|
2006-03-29 07:11:13 +07:00
|
|
|
break;
|
2011-07-19 17:25:36 +07:00
|
|
|
}
|
2006-03-29 07:11:13 +07:00
|
|
|
|
2011-07-19 17:25:36 +07:00
|
|
|
spin_lock(&sighand->siglock);
|
|
|
|
if (likely(sighand == tsk->sighand)) {
|
|
|
|
rcu_read_unlock();
|
2006-03-29 07:11:13 +07:00
|
|
|
break;
|
2011-07-19 17:25:36 +07:00
|
|
|
}
|
|
|
|
spin_unlock(&sighand->siglock);
|
|
|
|
rcu_read_unlock();
|
|
|
|
local_irq_restore(*flags);
|
2006-03-29 07:11:13 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return sighand;
|
|
|
|
}
|
|
|
|
|
2008-11-14 06:39:19 +07:00
|
|
|
/*
|
|
|
|
* send signal info to all the members of a group
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
|
|
|
|
{
|
2010-08-04 22:59:14 +07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
ret = check_kill_permission(sig, info, p);
|
|
|
|
rcu_read_unlock();
|
2006-03-29 07:11:13 +07:00
|
|
|
|
2009-09-24 05:57:00 +07:00
|
|
|
if (!ret && sig)
|
|
|
|
ret = do_send_sig_info(sig, info, p, true);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2008-02-08 19:19:22 +07:00
|
|
|
* __kill_pgrp_info() sends a signal to a process group: this is what the tty
|
2005-04-17 05:20:36 +07:00
|
|
|
* control characters do (^C, ^Z etc)
|
2008-11-14 06:39:19 +07:00
|
|
|
* - the caller must hold at least a readlock on tasklist_lock
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2006-10-02 16:17:10 +07:00
|
|
|
int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct task_struct *p = NULL;
|
|
|
|
int retval, success;
|
|
|
|
|
|
|
|
success = 0;
|
|
|
|
retval = -ESRCH;
|
2006-10-02 16:17:10 +07:00
|
|
|
do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
|
2005-04-17 05:20:36 +07:00
|
|
|
int err = group_send_sig_info(sig, info, p);
|
|
|
|
success |= !err;
|
|
|
|
retval = err;
|
2006-10-02 16:17:10 +07:00
|
|
|
} while_each_pid_task(pgrp, PIDTYPE_PGID, p);
|
2005-04-17 05:20:36 +07:00
|
|
|
return success ? 0 : retval;
|
|
|
|
}
|
|
|
|
|
2006-10-02 16:17:10 +07:00
|
|
|
int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-02-08 19:19:18 +07:00
|
|
|
int error = -ESRCH;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct task_struct *p;
|
|
|
|
|
2006-01-08 16:01:37 +07:00
|
|
|
rcu_read_lock();
|
2008-02-08 19:19:18 +07:00
|
|
|
retry:
|
2006-10-02 16:17:10 +07:00
|
|
|
p = pid_task(pid, PIDTYPE_PID);
|
2008-02-08 19:19:18 +07:00
|
|
|
if (p) {
|
2005-04-17 05:20:36 +07:00
|
|
|
error = group_send_sig_info(sig, info, p);
|
2008-02-08 19:19:18 +07:00
|
|
|
if (unlikely(error == -ESRCH))
|
|
|
|
/*
|
|
|
|
* The task was unhashed in between, try again.
|
|
|
|
* If it is dead, pid_task() will return NULL,
|
|
|
|
* if we race with de_thread() it will find the
|
|
|
|
* new leader.
|
|
|
|
*/
|
|
|
|
goto retry;
|
|
|
|
}
|
2006-01-08 16:01:37 +07:00
|
|
|
rcu_read_unlock();
|
2008-04-30 14:52:45 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2011-04-05 04:59:31 +07:00
|
|
|
int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
|
2006-10-02 16:17:10 +07:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
rcu_read_lock();
|
2007-10-19 13:40:14 +07:00
|
|
|
error = kill_pid_info(sig, info, find_vpid(pid));
|
2006-10-02 16:17:10 +07:00
|
|
|
rcu_read_unlock();
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2011-09-26 22:45:18 +07:00
|
|
|
static int kill_as_cred_perm(const struct cred *cred,
|
|
|
|
struct task_struct *target)
|
|
|
|
{
|
|
|
|
const struct cred *pcred = __task_cred(target);
|
2012-03-04 11:21:47 +07:00
|
|
|
if (!uid_eq(cred->euid, pcred->suid) && !uid_eq(cred->euid, pcred->uid) &&
|
|
|
|
!uid_eq(cred->uid, pcred->suid) && !uid_eq(cred->uid, pcred->uid))
|
2011-09-26 22:45:18 +07:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-10-02 16:17:28 +07:00
|
|
|
/* like kill_pid_info(), but doesn't use uid/euid of "current" */
|
2011-09-26 22:45:18 +07:00
|
|
|
int kill_pid_info_as_cred(int sig, struct siginfo *info, struct pid *pid,
|
|
|
|
const struct cred *cred, u32 secid)
|
2005-10-11 00:44:29 +07:00
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
|
|
|
struct task_struct *p;
|
2009-12-10 07:53:17 +07:00
|
|
|
unsigned long flags;
|
2005-10-11 00:44:29 +07:00
|
|
|
|
|
|
|
if (!valid_signal(sig))
|
|
|
|
return ret;
|
|
|
|
|
2009-12-10 07:53:17 +07:00
|
|
|
rcu_read_lock();
|
2006-10-02 16:17:28 +07:00
|
|
|
p = pid_task(pid, PIDTYPE_PID);
|
2005-10-11 00:44:29 +07:00
|
|
|
if (!p) {
|
|
|
|
ret = -ESRCH;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2011-09-26 22:45:18 +07:00
|
|
|
if (si_fromuser(info) && !kill_as_cred_perm(cred, p)) {
|
2005-10-11 00:44:29 +07:00
|
|
|
ret = -EPERM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2006-06-30 15:55:47 +07:00
|
|
|
ret = security_task_kill(p, info, sig, secid);
|
|
|
|
if (ret)
|
|
|
|
goto out_unlock;
|
2009-12-10 07:53:17 +07:00
|
|
|
|
|
|
|
if (sig) {
|
|
|
|
if (lock_task_sighand(p, &flags)) {
|
|
|
|
ret = __send_signal(sig, info, p, 1, 0);
|
|
|
|
unlock_task_sighand(p, &flags);
|
|
|
|
} else
|
|
|
|
ret = -ESRCH;
|
2005-10-11 00:44:29 +07:00
|
|
|
}
|
|
|
|
out_unlock:
|
2009-12-10 07:53:17 +07:00
|
|
|
rcu_read_unlock();
|
2005-10-11 00:44:29 +07:00
|
|
|
return ret;
|
|
|
|
}
|
2011-09-26 22:45:18 +07:00
|
|
|
EXPORT_SYMBOL_GPL(kill_pid_info_as_cred);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* kill_something_info() interprets pid in interesting ways just like kill(2).
|
|
|
|
*
|
|
|
|
* POSIX specifies that kill(-1,sig) is unspecified, but what we have
|
|
|
|
* is probably wrong. Should make it like BSD or SYSV.
|
|
|
|
*/
|
|
|
|
|
2008-07-25 15:47:33 +07:00
|
|
|
static int kill_something_info(int sig, struct siginfo *info, pid_t pid)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-02-12 15:52:55 +07:00
|
|
|
int ret;
|
2008-02-08 19:19:22 +07:00
|
|
|
|
|
|
|
if (pid > 0) {
|
|
|
|
rcu_read_lock();
|
|
|
|
ret = kill_pid_info(sig, info, find_vpid(pid));
|
|
|
|
rcu_read_unlock();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
if (pid != -1) {
|
|
|
|
ret = __kill_pgrp_info(sig, info,
|
|
|
|
pid ? find_vpid(-pid) : task_pgrp(current));
|
|
|
|
} else {
|
2005-04-17 05:20:36 +07:00
|
|
|
int retval = 0, count = 0;
|
|
|
|
struct task_struct * p;
|
|
|
|
|
|
|
|
for_each_process(p) {
|
2008-10-30 04:01:11 +07:00
|
|
|
if (task_pid_vnr(p) > 1 &&
|
|
|
|
!same_thread_group(p, current)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
int err = group_send_sig_info(sig, info, p);
|
|
|
|
++count;
|
|
|
|
if (err != -EPERM)
|
|
|
|
retval = err;
|
|
|
|
}
|
|
|
|
}
|
2007-02-12 15:52:55 +07:00
|
|
|
ret = count ? retval : -ESRCH;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2008-02-08 19:19:22 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
2007-02-12 15:52:55 +07:00
|
|
|
return ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are for backward compatibility with the rest of the kernel source.
|
|
|
|
*/
|
|
|
|
|
2011-04-05 04:59:31 +07:00
|
|
|
int send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Make sure legacy kernel users don't send in bad values
|
|
|
|
* (normal paths check this in check_kill_permission).
|
|
|
|
*/
|
2005-05-01 22:59:14 +07:00
|
|
|
if (!valid_signal(sig))
|
2005-04-17 05:20:36 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2009-09-24 05:57:00 +07:00
|
|
|
return do_send_sig_info(sig, info, p, false);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2005-10-31 06:03:44 +07:00
|
|
|
#define __si_special(priv) \
|
|
|
|
((priv) ? SEND_SIG_PRIV : SEND_SIG_NOINFO)
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
int
|
|
|
|
send_sig(int sig, struct task_struct *p, int priv)
|
|
|
|
{
|
2005-10-31 06:03:44 +07:00
|
|
|
return send_sig_info(sig, __si_special(priv), p);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
force_sig(int sig, struct task_struct *p)
|
|
|
|
{
|
2005-10-31 06:03:44 +07:00
|
|
|
force_sig_info(sig, SEND_SIG_PRIV, p);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When things go south during signal handling, we
|
|
|
|
* will force a SIGSEGV. And if the signal that caused
|
|
|
|
* the problem was already a SIGSEGV, we'll want to
|
|
|
|
* make sure we don't even try to deliver the signal..
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
force_sigsegv(int sig, struct task_struct *p)
|
|
|
|
{
|
|
|
|
if (sig == SIGSEGV) {
|
|
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&p->sighand->siglock, flags);
|
|
|
|
p->sighand->action[sig - 1].sa.sa_handler = SIG_DFL;
|
|
|
|
spin_unlock_irqrestore(&p->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
force_sig(SIGSEGV, p);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-02 16:17:10 +07:00
|
|
|
int kill_pgrp(struct pid *pid, int sig, int priv)
|
|
|
|
{
|
2008-02-08 19:19:22 +07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
ret = __kill_pgrp_info(sig, __si_special(priv), pid);
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
return ret;
|
2006-10-02 16:17:10 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(kill_pgrp);
|
|
|
|
|
|
|
|
int kill_pid(struct pid *pid, int sig, int priv)
|
|
|
|
{
|
|
|
|
return kill_pid_info(sig, __si_special(priv), pid);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(kill_pid);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* These functions support sending signals using preallocated sigqueue
|
|
|
|
* structures. This is needed "because realtime applications cannot
|
|
|
|
* afford to lose notifications of asynchronous events, like timer
|
2011-04-05 04:59:31 +07:00
|
|
|
* expirations or I/O completions". In the case of POSIX Timers
|
2005-04-17 05:20:36 +07:00
|
|
|
* we allocate the sigqueue structure from the timer_create. If this
|
|
|
|
* allocation fails we are able to report the failure to the application
|
|
|
|
* with an EAGAIN error.
|
|
|
|
*/
|
|
|
|
struct sigqueue *sigqueue_alloc(void)
|
|
|
|
{
|
2009-11-08 22:46:42 +07:00
|
|
|
struct sigqueue *q = __sigqueue_alloc(-1, current, GFP_KERNEL, 0);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2009-11-08 22:46:42 +07:00
|
|
|
if (q)
|
2005-04-17 05:20:36 +07:00
|
|
|
q->flags |= SIGQUEUE_PREALLOC;
|
2009-11-08 22:46:42 +07:00
|
|
|
|
|
|
|
return q;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void sigqueue_free(struct sigqueue *q)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
2007-08-31 13:56:35 +07:00
|
|
|
spinlock_t *lock = ¤t->sighand->siglock;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
|
|
|
|
/*
|
2008-05-26 23:55:42 +07:00
|
|
|
* We must hold ->siglock while testing q->list
|
|
|
|
* to serialize with collect_signal() or with
|
2008-05-24 03:04:41 +07:00
|
|
|
* __exit_signal()->flush_sigqueue().
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2007-08-31 13:56:35 +07:00
|
|
|
spin_lock_irqsave(lock, flags);
|
2008-05-26 23:55:42 +07:00
|
|
|
q->flags &= ~SIGQUEUE_PREALLOC;
|
|
|
|
/*
|
|
|
|
* If it is queued it will be freed when dequeued,
|
|
|
|
* like the "regular" sigqueue.
|
|
|
|
*/
|
2007-08-31 13:56:35 +07:00
|
|
|
if (!list_empty(&q->list))
|
2008-05-26 23:55:42 +07:00
|
|
|
q = NULL;
|
2007-08-31 13:56:35 +07:00
|
|
|
spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
2008-05-26 23:55:42 +07:00
|
|
|
if (q)
|
|
|
|
__sigqueue_free(q);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-04-30 14:52:57 +07:00
|
|
|
int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
|
2008-04-30 14:52:41 +07:00
|
|
|
{
|
2008-04-30 14:52:56 +07:00
|
|
|
int sig = q->info.si_signo;
|
2008-04-30 14:52:54 +07:00
|
|
|
struct sigpending *pending;
|
2008-04-30 14:52:56 +07:00
|
|
|
unsigned long flags;
|
2011-11-23 03:37:41 +07:00
|
|
|
int ret, result;
|
2008-04-30 14:52:54 +07:00
|
|
|
|
2008-04-30 14:52:55 +07:00
|
|
|
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
|
2008-04-30 14:52:56 +07:00
|
|
|
|
|
|
|
ret = -1;
|
|
|
|
if (!likely(lock_task_sighand(t, &flags)))
|
|
|
|
goto ret;
|
|
|
|
|
2008-04-30 14:52:59 +07:00
|
|
|
ret = 1; /* the signal is ignored */
|
2011-11-23 03:37:41 +07:00
|
|
|
result = TRACE_SIGNAL_IGNORED;
|
2012-03-24 05:02:45 +07:00
|
|
|
if (!prepare_signal(sig, t, false))
|
2008-04-30 14:52:56 +07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = 0;
|
2008-04-30 14:52:41 +07:00
|
|
|
if (unlikely(!list_empty(&q->list))) {
|
|
|
|
/*
|
|
|
|
* If an SI_TIMER entry is already queue just increment
|
|
|
|
* the overrun count.
|
|
|
|
*/
|
|
|
|
BUG_ON(q->info.si_code != SI_TIMER);
|
|
|
|
q->info.si_overrun++;
|
2011-11-23 03:37:41 +07:00
|
|
|
result = TRACE_SIGNAL_ALREADY_PENDING;
|
2008-04-30 14:52:56 +07:00
|
|
|
goto out;
|
2008-04-30 14:52:41 +07:00
|
|
|
}
|
posix-timers: fix posix_timer_event() vs dequeue_signal() race
The bug was reported and analysed by Mark McLoughlin <markmc@redhat.com>,
the patch is based on his and Roland's suggestions.
posix_timer_event() always rewrites the pre-allocated siginfo before sending
the signal. Most of the written info is the same all the time, but memset(0)
is very wrong. If ->sigq is queued we can race with collect_signal() which
can fail to find this siginfo looking at .si_signo, or copy_siginfo() can
copy the wrong .si_code/si_tid/etc.
In short, sys_timer_settime() can in fact stop the active timer, or the user
can receive the siginfo with the wrong .si_xxx values.
Move "memset(->info, 0)" from posix_timer_event() to alloc_posix_timer(),
change send_sigqueue() to set .si_overrun = 0 when ->sigq is not queued.
It would be nice to move the whole sigq->info initialization from send to
create path, but this is not easy to do without uglifying timer_create()
further.
As Roland rightly pointed out, we need more cleanups/fixes here, see the
"FIXME" comment in the patch. Hopefully this patch makes sense anyway, and
it can mask the most bad implications.
Reported-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Mark McLoughlin <markmc@redhat.com>
Cc: Oliver Pinter <oliver.pntr@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: stable@kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/posix-timers.c | 17 +++++++++++++----
kernel/signal.c | 1 +
2 files changed, 14 insertions(+), 4 deletions(-)
2008-07-23 23:52:05 +07:00
|
|
|
q->info.si_overrun = 0;
|
2008-04-30 14:52:41 +07:00
|
|
|
|
|
|
|
signalfd_notify(t, sig);
|
2008-04-30 14:52:54 +07:00
|
|
|
pending = group ? &t->signal->shared_pending : &t->pending;
|
2008-04-30 14:52:41 +07:00
|
|
|
list_add_tail(&q->list, &pending->list);
|
|
|
|
sigaddset(&pending->signal, sig);
|
2008-04-30 14:52:55 +07:00
|
|
|
complete_signal(sig, t, group);
|
2011-11-23 03:37:41 +07:00
|
|
|
result = TRACE_SIGNAL_DELIVERED;
|
2008-04-30 14:52:56 +07:00
|
|
|
out:
|
2011-11-23 03:37:41 +07:00
|
|
|
trace_signal_generate(sig, &q->info, t, group, result);
|
2008-04-30 14:52:56 +07:00
|
|
|
unlock_task_sighand(t, &flags);
|
|
|
|
ret:
|
|
|
|
return ret;
|
2008-04-30 14:52:41 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Let a parent know about the death of a child.
|
|
|
|
* For a stopped/continued status change, use do_notify_parent_cldstop instead.
|
2008-07-26 09:45:54 +07:00
|
|
|
*
|
2011-06-23 04:08:18 +07:00
|
|
|
* Returns true if our parent ignored us and so we've switched to
|
|
|
|
* self-reaping.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2011-06-23 04:08:18 +07:00
|
|
|
bool do_notify_parent(struct task_struct *tsk, int sig)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct siginfo info;
|
|
|
|
unsigned long flags;
|
|
|
|
struct sighand_struct *psig;
|
2011-06-23 04:08:18 +07:00
|
|
|
bool autoreap = false;
|
2012-11-13 20:20:55 +07:00
|
|
|
cputime_t utime, stime;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
BUG_ON(sig == -1);
|
|
|
|
|
|
|
|
/* do_notify_parent_cldstop should have been called instead. */
|
2007-12-06 23:07:35 +07:00
|
|
|
BUG_ON(task_is_stopped_or_traced(tsk));
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-06-17 21:50:34 +07:00
|
|
|
BUG_ON(!tsk->ptrace &&
|
2005-04-17 05:20:36 +07:00
|
|
|
(tsk->group_leader != tsk || !thread_group_empty(tsk)));
|
|
|
|
|
2012-03-19 23:03:41 +07:00
|
|
|
if (sig != SIGCHLD) {
|
|
|
|
/*
|
|
|
|
* This is only possible if parent == real_parent.
|
|
|
|
* Check if it has changed security domain.
|
|
|
|
*/
|
|
|
|
if (tsk->parent_exec_id != tsk->parent->self_exec_id)
|
|
|
|
sig = SIGCHLD;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
info.si_signo = sig;
|
|
|
|
info.si_errno = 0;
|
2007-10-19 13:40:14 +07:00
|
|
|
/*
|
2012-06-01 06:26:39 +07:00
|
|
|
* We are under tasklist_lock here so our parent is tied to
|
|
|
|
* us and cannot change.
|
2007-10-19 13:40:14 +07:00
|
|
|
*
|
2012-06-01 06:26:39 +07:00
|
|
|
* task_active_pid_ns will always return the same pid namespace
|
|
|
|
* until a task passes through release_task.
|
2007-10-19 13:40:14 +07:00
|
|
|
*
|
|
|
|
* write_lock() currently calls preempt_disable() which is the
|
|
|
|
* same as rcu_read_lock(), but according to Oleg, this is not
|
|
|
|
* correct to rely on this
|
|
|
|
*/
|
|
|
|
rcu_read_lock();
|
2012-06-01 06:26:39 +07:00
|
|
|
info.si_pid = task_pid_nr_ns(tsk, task_active_pid_ns(tsk->parent));
|
2012-03-14 06:04:35 +07:00
|
|
|
info.si_uid = from_kuid_munged(task_cred_xxx(tsk->parent, user_ns),
|
|
|
|
task_uid(tsk));
|
2007-10-19 13:40:14 +07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2012-11-13 20:20:55 +07:00
|
|
|
task_cputime(tsk, &utime, &stime);
|
|
|
|
info.si_utime = cputime_to_clock_t(utime + tsk->signal->utime);
|
|
|
|
info.si_stime = cputime_to_clock_t(stime + tsk->signal->stime);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
info.si_status = tsk->exit_code & 0x7f;
|
|
|
|
if (tsk->exit_code & 0x80)
|
|
|
|
info.si_code = CLD_DUMPED;
|
|
|
|
else if (tsk->exit_code & 0x7f)
|
|
|
|
info.si_code = CLD_KILLED;
|
|
|
|
else {
|
|
|
|
info.si_code = CLD_EXITED;
|
|
|
|
info.si_status = tsk->exit_code >> 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
psig = tsk->parent->sighand;
|
|
|
|
spin_lock_irqsave(&psig->siglock, flags);
|
2011-06-17 21:50:34 +07:00
|
|
|
if (!tsk->ptrace && sig == SIGCHLD &&
|
2005-04-17 05:20:36 +07:00
|
|
|
(psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
|
|
|
|
(psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
|
|
|
|
/*
|
|
|
|
* We are exiting and our parent doesn't care. POSIX.1
|
|
|
|
* defines special semantics for setting SIGCHLD to SIG_IGN
|
|
|
|
* or setting the SA_NOCLDWAIT flag: we should be reaped
|
|
|
|
* automatically and not left for our parent's wait4 call.
|
|
|
|
* Rather than having the parent do it as a magic kind of
|
|
|
|
* signal handler, we just set this to tell do_exit that we
|
|
|
|
* can be cleaned up without becoming a zombie. Note that
|
|
|
|
* we still call __wake_up_parent in this case, because a
|
|
|
|
* blocked sys_wait4 might now return -ECHILD.
|
|
|
|
*
|
|
|
|
* Whether we send SIGCHLD or not for SA_NOCLDWAIT
|
|
|
|
* is implementation-defined: we do (if you don't want
|
|
|
|
* it, just use SIG_IGN instead).
|
|
|
|
*/
|
2011-06-23 04:08:18 +07:00
|
|
|
autoreap = true;
|
2005-04-17 05:20:36 +07:00
|
|
|
if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN)
|
2011-06-23 04:08:18 +07:00
|
|
|
sig = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2011-06-23 04:08:18 +07:00
|
|
|
if (valid_signal(sig) && sig)
|
2005-04-17 05:20:36 +07:00
|
|
|
__group_send_sig_info(sig, &info, tsk->parent);
|
|
|
|
__wake_up_parent(tsk, tsk->parent);
|
|
|
|
spin_unlock_irqrestore(&psig->siglock, flags);
|
2008-07-26 09:45:54 +07:00
|
|
|
|
2011-06-23 04:08:18 +07:00
|
|
|
return autoreap;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-03-23 16:37:01 +07:00
|
|
|
/**
|
|
|
|
* do_notify_parent_cldstop - notify parent of stopped/continued state change
|
|
|
|
* @tsk: task reporting the state change
|
|
|
|
* @for_ptracer: the notification is for ptracer
|
|
|
|
* @why: CLD_{CONTINUED|STOPPED|TRAPPED} to report
|
|
|
|
*
|
|
|
|
* Notify @tsk's parent that the stopped/continued state has changed. If
|
|
|
|
* @for_ptracer is %false, @tsk's group leader notifies to its real parent.
|
|
|
|
* If %true, @tsk reports to @tsk->parent which should be the ptracer.
|
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with tasklist_lock at least read locked.
|
|
|
|
*/
|
|
|
|
static void do_notify_parent_cldstop(struct task_struct *tsk,
|
|
|
|
bool for_ptracer, int why)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct siginfo info;
|
|
|
|
unsigned long flags;
|
2005-09-07 05:17:32 +07:00
|
|
|
struct task_struct *parent;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct sighand_struct *sighand;
|
2012-11-13 20:20:55 +07:00
|
|
|
cputime_t utime, stime;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-03-23 16:37:01 +07:00
|
|
|
if (for_ptracer) {
|
2005-09-07 05:17:32 +07:00
|
|
|
parent = tsk->parent;
|
2011-03-23 16:37:01 +07:00
|
|
|
} else {
|
2005-09-07 05:17:32 +07:00
|
|
|
tsk = tsk->group_leader;
|
|
|
|
parent = tsk->real_parent;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
info.si_signo = SIGCHLD;
|
|
|
|
info.si_errno = 0;
|
2007-10-19 13:40:14 +07:00
|
|
|
/*
|
2011-04-05 04:59:31 +07:00
|
|
|
* see comment in do_notify_parent() about the following 4 lines
|
2007-10-19 13:40:14 +07:00
|
|
|
*/
|
|
|
|
rcu_read_lock();
|
2010-03-03 05:51:53 +07:00
|
|
|
info.si_pid = task_pid_nr_ns(tsk, task_active_pid_ns(parent));
|
2012-03-14 06:04:35 +07:00
|
|
|
info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns), task_uid(tsk));
|
2007-10-19 13:40:14 +07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2012-11-13 20:20:55 +07:00
|
|
|
task_cputime(tsk, &utime, &stime);
|
|
|
|
info.si_utime = cputime_to_clock_t(utime);
|
|
|
|
info.si_stime = cputime_to_clock_t(stime);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
info.si_code = why;
|
|
|
|
switch (why) {
|
|
|
|
case CLD_CONTINUED:
|
|
|
|
info.si_status = SIGCONT;
|
|
|
|
break;
|
|
|
|
case CLD_STOPPED:
|
|
|
|
info.si_status = tsk->signal->group_exit_code & 0x7f;
|
|
|
|
break;
|
|
|
|
case CLD_TRAPPED:
|
|
|
|
info.si_status = tsk->exit_code & 0x7f;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
|
|
|
sighand = parent->sighand;
|
|
|
|
spin_lock_irqsave(&sighand->siglock, flags);
|
|
|
|
if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
|
|
|
|
!(sighand->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDSTOP))
|
|
|
|
__group_send_sig_info(SIGCHLD, &info, parent);
|
|
|
|
/*
|
|
|
|
* Even if SIGCHLD is not generated, we must wake up wait4 calls.
|
|
|
|
*/
|
|
|
|
__wake_up_parent(tsk, parent);
|
|
|
|
spin_unlock_irqrestore(&sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
2006-06-26 14:26:07 +07:00
|
|
|
static inline int may_ptrace_stop(void)
|
|
|
|
{
|
2011-06-17 21:50:34 +07:00
|
|
|
if (!likely(current->ptrace))
|
2006-06-26 14:26:07 +07:00
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* Are we in the middle of do_coredump?
|
|
|
|
* If so and our tracer is also part of the coredump stopping
|
|
|
|
* is a deadlock situation, and pointless because our tracer
|
|
|
|
* is dead so don't allow us to stop.
|
|
|
|
* If SIGKILL was already sent before the caller unlocked
|
2008-07-25 15:47:41 +07:00
|
|
|
* ->siglock we must see ->core_state != NULL. Otherwise it
|
2006-06-26 14:26:07 +07:00
|
|
|
* is safe to enter schedule().
|
2013-01-22 02:48:00 +07:00
|
|
|
*
|
|
|
|
* This is almost outdated, a task with the pending SIGKILL can't
|
|
|
|
* block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported
|
|
|
|
* after SIGKILL was already dequeued.
|
2006-06-26 14:26:07 +07:00
|
|
|
*/
|
2008-07-25 15:47:41 +07:00
|
|
|
if (unlikely(current->mm->core_state) &&
|
2006-06-26 14:26:07 +07:00
|
|
|
unlikely(current->mm == current->parent->mm))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-02-06 16:37:37 +07:00
|
|
|
/*
|
2011-04-05 04:59:31 +07:00
|
|
|
* Return non-zero if there is a SIGKILL that should be waking us up.
|
2008-02-06 16:37:37 +07:00
|
|
|
* Called with the siglock held.
|
|
|
|
*/
|
|
|
|
static int sigkill_pending(struct task_struct *tsk)
|
|
|
|
{
|
2008-07-25 15:47:37 +07:00
|
|
|
return sigismember(&tsk->pending.signal, SIGKILL) ||
|
|
|
|
sigismember(&tsk->signal->shared_pending.signal, SIGKILL);
|
2008-02-06 16:37:37 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* This must be called with current->sighand->siglock held.
|
|
|
|
*
|
|
|
|
* This should be the path for all ptrace stops.
|
|
|
|
* We always set current->last_siginfo while stopped here.
|
|
|
|
* That makes it a way to test a stopped process for
|
|
|
|
* being ptrace-stopped vs being job-control-stopped.
|
|
|
|
*
|
2008-02-08 19:19:03 +07:00
|
|
|
* If we actually decide not to stop at all because the tracer
|
|
|
|
* is gone, we keep current->exit_code unless clear_code.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2011-03-23 16:37:00 +07:00
|
|
|
static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
|
2010-10-28 05:34:07 +07:00
|
|
|
__releases(¤t->sighand->siglock)
|
|
|
|
__acquires(¤t->sighand->siglock)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
bool gstop_done = false;
|
|
|
|
|
2008-02-06 16:37:37 +07:00
|
|
|
if (arch_ptrace_stop_needed(exit_code, info)) {
|
|
|
|
/*
|
|
|
|
* The arch code has something special to do before a
|
|
|
|
* ptrace stop. This is allowed to block, e.g. for faults
|
|
|
|
* on user stack pages. We can't keep the siglock while
|
|
|
|
* calling arch_ptrace_stop, so we must release it now.
|
|
|
|
* To preserve proper semantics, we must do this before
|
|
|
|
* any signal bookkeeping like checking group_stop_count.
|
|
|
|
* Meanwhile, a SIGKILL could come in before we retake the
|
|
|
|
* siglock. That must prevent us from sleeping in TASK_TRACED.
|
|
|
|
* So after regaining the lock, we must check for SIGKILL.
|
|
|
|
*/
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
arch_ptrace_stop(exit_code, info);
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
2008-07-25 15:47:37 +07:00
|
|
|
if (sigkill_pending(current))
|
|
|
|
return;
|
2008-02-06 16:37:37 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
2011-06-02 16:13:59 +07:00
|
|
|
* We're committing to trapping. TRACED should be visible before
|
|
|
|
* TRAPPING is cleared; otherwise, the tracer might fail do_wait().
|
|
|
|
* Also, transition to TRACED and updates to ->jobctl should be
|
|
|
|
* atomic with respect to siglock and should be done after the arch
|
|
|
|
* hook as siglock is released and regrabbed across it.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2011-06-02 16:13:59 +07:00
|
|
|
set_current_state(TASK_TRACED);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
current->last_siginfo = info;
|
|
|
|
current->exit_code = exit_code;
|
|
|
|
|
2011-03-23 16:37:00 +07:00
|
|
|
/*
|
2011-03-23 16:37:00 +07:00
|
|
|
* If @why is CLD_STOPPED, we're trapping to participate in a group
|
|
|
|
* stop. Do the bookkeeping. Note that if SIGCONT was delievered
|
2011-06-14 16:20:14 +07:00
|
|
|
* across siglock relocks since INTERRUPT was scheduled, PENDING
|
|
|
|
* could be clear now. We act as if SIGCONT is received after
|
|
|
|
* TASK_TRACED is entered - ignore it.
|
2011-03-23 16:37:00 +07:00
|
|
|
*/
|
2011-06-02 16:13:59 +07:00
|
|
|
if (why == CLD_STOPPED && (current->jobctl & JOBCTL_STOP_PENDING))
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
gstop_done = task_participate_group_stop(current);
|
2011-03-23 16:37:00 +07:00
|
|
|
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
/* any trap clears pending STOP trap, STOP trap clears NOTIFY */
|
2011-06-14 16:20:14 +07:00
|
|
|
task_clear_jobctl_pending(current, JOBCTL_TRAP_STOP);
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
if (info && info->si_code >> 8 == PTRACE_EVENT_STOP)
|
|
|
|
task_clear_jobctl_pending(current, JOBCTL_TRAP_NOTIFY);
|
2011-06-14 16:20:14 +07:00
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
/* entering a trap, clear TRAPPING */
|
2011-06-02 16:13:59 +07:00
|
|
|
task_clear_jobctl_trapping(current);
|
2011-03-23 16:37:00 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
read_lock(&tasklist_lock);
|
2008-07-25 15:47:37 +07:00
|
|
|
if (may_ptrace_stop()) {
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
/*
|
|
|
|
* Notify parents of the stop.
|
|
|
|
*
|
|
|
|
* While ptraced, there are two parents - the ptracer and
|
|
|
|
* the real_parent of the group_leader. The ptracer should
|
|
|
|
* know about every stop while the real parent is only
|
|
|
|
* interested in the completion of group stop. The states
|
|
|
|
* for the two don't interact with each other. Notify
|
|
|
|
* separately unless they're gonna be duplicates.
|
|
|
|
*/
|
|
|
|
do_notify_parent_cldstop(current, true, why);
|
2011-06-24 22:34:23 +07:00
|
|
|
if (gstop_done && ptrace_reparented(current))
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
do_notify_parent_cldstop(current, false, why);
|
|
|
|
|
2009-03-23 22:07:24 +07:00
|
|
|
/*
|
|
|
|
* Don't want to allow preemption here, because
|
|
|
|
* sys_ptrace() needs this task to be inactive.
|
|
|
|
*
|
|
|
|
* XXX: implement read_unlock_no_resched().
|
|
|
|
*/
|
|
|
|
preempt_disable();
|
2005-04-17 05:20:36 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
2009-03-23 22:07:24 +07:00
|
|
|
preempt_enable_no_resched();
|
2012-10-27 00:46:06 +07:00
|
|
|
freezable_schedule();
|
2005-04-17 05:20:36 +07:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* By the time we got the lock, our tracer went away.
|
2008-02-08 19:19:00 +07:00
|
|
|
* Don't drop the lock yet, another tracer may come.
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
*
|
|
|
|
* If @gstop_done, the ptracer went away between group stop
|
|
|
|
* completion and here. During detach, it would have set
|
2011-06-02 16:13:59 +07:00
|
|
|
* JOBCTL_STOP_PENDING on us and we'll re-enter
|
|
|
|
* TASK_STOPPED in do_signal_stop() on return, so notifying
|
|
|
|
* the real parent of the group stop completion is enough.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
if (gstop_done)
|
|
|
|
do_notify_parent_cldstop(current, false, why);
|
|
|
|
|
2013-01-22 02:48:00 +07:00
|
|
|
/* tasklist protects us from ptrace_freeze_traced() */
|
2008-02-08 19:19:00 +07:00
|
|
|
__set_current_state(TASK_RUNNING);
|
2008-02-08 19:19:03 +07:00
|
|
|
if (clear_code)
|
|
|
|
current->exit_code = 0;
|
2008-02-08 19:19:00 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are back. Now reacquire the siglock before touching
|
|
|
|
* last_siginfo, so that we are sure to have synchronized with
|
|
|
|
* any signal-sending on another CPU that wants to examine it.
|
|
|
|
*/
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
current->last_siginfo = NULL;
|
|
|
|
|
ptrace: implement PTRACE_LISTEN
The previous patch implemented async notification for ptrace but it
only worked while trace is running. This patch introduces
PTRACE_LISTEN which is suggested by Oleg Nestrov.
It's allowed iff tracee is in STOP trap and puts tracee into
quasi-running state - tracee never really runs but wait(2) and
ptrace(2) consider it to be running. While ptracer is listening,
tracee is allowed to re-enter STOP to notify an async event.
Listening state is cleared on the first notification. Ptracer can
also clear it by issuing INTERRUPT - tracee will re-trap into STOP
with listening state cleared.
This allows ptracer to monitor group stop state without running tracee
- use INTERRUPT to put tracee into STOP trap, issue LISTEN and then
wait(2) to wait for the next group stop event. When it happens,
PTRACE_GETSIGINFO provides information to determine the current state.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_LISTEN 0x4208
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
if (si.si_signo != SIGTRAP)
ptrace(PTRACE_LISTEN, tracee, NULL, NULL);
else
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
This is identical to the program to test TRAP_NOTIFY except that
tracee is PTRACE_LISTEN'd instead of PTRACE_CONT'd when group stopped.
This allows ptracer to monitor when group stop ends without running
tracee.
# ./test-listen
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
-v2: Moved JOBCTL_LISTENING check in wait_task_stopped() into
task_stopped_code() as suggested by Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:18 +07:00
|
|
|
/* LISTENING can be set only during STOP traps, clear it */
|
|
|
|
current->jobctl &= ~JOBCTL_LISTENING;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Queued signals ignored us while we were stopped for tracing.
|
|
|
|
* So check for any that we should take before resuming user mode.
|
2007-06-06 17:59:00 +07:00
|
|
|
* This sets TIF_SIGPENDING, but never clears it.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2007-06-06 17:59:00 +07:00
|
|
|
recalc_sigpending_tsk(current);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
static void ptrace_do_notify(int signr, int exit_code, int why)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
|
|
|
|
memset(&info, 0, sizeof info);
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
info.si_signo = signr;
|
2005-04-17 05:20:36 +07:00
|
|
|
info.si_code = exit_code;
|
2007-10-19 13:40:14 +07:00
|
|
|
info.si_pid = task_pid_vnr(current);
|
2012-02-08 22:00:08 +07:00
|
|
|
info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/* Let the debugger run. */
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
ptrace_stop(exit_code, why, 1, &info);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ptrace_notify(int exit_code)
|
|
|
|
{
|
|
|
|
BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
|
2012-08-27 02:12:17 +07:00
|
|
|
if (unlikely(current->task_works))
|
|
|
|
task_work_run();
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
ptrace_do_notify(SIGTRAP, exit_code, CLD_TRAPPED);
|
2005-04-17 05:20:36 +07:00
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
}
|
|
|
|
|
2011-06-14 16:20:14 +07:00
|
|
|
/**
|
|
|
|
* do_signal_stop - handle group stop for SIGSTOP and other stop signals
|
|
|
|
* @signr: signr causing group stop if initiating
|
|
|
|
*
|
|
|
|
* If %JOBCTL_STOP_PENDING is not set yet, initiate group stop with @signr
|
|
|
|
* and participate in it. If already set, participate in the existing
|
|
|
|
* group stop. If participated in a group stop (and thus slept), %true is
|
|
|
|
* returned with siglock released.
|
|
|
|
*
|
|
|
|
* If ptraced, this function doesn't handle stop itself. Instead,
|
|
|
|
* %JOBCTL_TRAP_STOP is scheduled and %false is returned with siglock
|
|
|
|
* untouched. The caller must ensure that INTERRUPT trap handling takes
|
|
|
|
* places afterwards.
|
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @current->sighand->siglock held, which is released
|
|
|
|
* on %true return.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* %false if group stop is already cancelled or ptrace trap is scheduled.
|
|
|
|
* %true if participated in group stop.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2011-06-14 16:20:14 +07:00
|
|
|
static bool do_signal_stop(int signr)
|
|
|
|
__releases(¤t->sighand->siglock)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct signal_struct *sig = current->signal;
|
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
if (!(current->jobctl & JOBCTL_STOP_PENDING)) {
|
|
|
|
unsigned int gstop = JOBCTL_STOP_PENDING | JOBCTL_STOP_CONSUME;
|
2008-02-05 13:27:24 +07:00
|
|
|
struct task_struct *t;
|
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
/* signr will be recorded in task->jobctl for retries */
|
|
|
|
WARN_ON_ONCE(signr & ~JOBCTL_STOP_SIGMASK);
|
2011-03-23 16:37:00 +07:00
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
if (!likely(current->jobctl & JOBCTL_STOP_DEQUEUED) ||
|
2008-04-30 14:52:36 +07:00
|
|
|
unlikely(signal_group_exit(sig)))
|
2011-06-14 16:20:14 +07:00
|
|
|
return false;
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
job control: Don't set group_stop exit_code if re-entering job control stop
While ptraced, a task may be resumed while the containing process is
still job control stopped. If the task receives another stop signal
in this state, it will still initiate group stop, which generates
group_exit_code, which the real parent would be able to see once the
ptracer detaches.
In this scenario, the real parent may see two consecutive CLD_STOPPED
events from two stop signals without intervening SIGCONT, which
normally is impossible.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
pid_t tracee;
siginfo_t si;
tracee = fork();
if (!tracee)
while (1)
pause();
kill(tracee, SIGSTOP);
waitid(P_PID, tracee, &si, WSTOPPED);
if (!fork()) {
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_DETACH, tracee, NULL, NULL);
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG);
if (si.si_pid)
printf("st=%02d c=%02d\n", si.si_status, si.si_code);
}
return 0;
}
Before the patch, the latter waitid() in polling mode reports the
second stopped event generated by the implied SIGSTOP of
PTRACE_ATTACH.
st=19 c=05
^C
After the patch, the second event is not reported.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
* There is no group stop already in progress. We must
|
|
|
|
* initiate one now.
|
|
|
|
*
|
|
|
|
* While ptraced, a task may be resumed while group stop is
|
|
|
|
* still in effect and then receive a stop signal and
|
|
|
|
* initiate another group stop. This deviates from the
|
|
|
|
* usual behavior as two consecutive stop signals can't
|
2011-04-02 01:12:16 +07:00
|
|
|
* cause two group stops when !ptraced. That is why we
|
|
|
|
* also check !task_is_stopped(t) below.
|
job control: Don't set group_stop exit_code if re-entering job control stop
While ptraced, a task may be resumed while the containing process is
still job control stopped. If the task receives another stop signal
in this state, it will still initiate group stop, which generates
group_exit_code, which the real parent would be able to see once the
ptracer detaches.
In this scenario, the real parent may see two consecutive CLD_STOPPED
events from two stop signals without intervening SIGCONT, which
normally is impossible.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
pid_t tracee;
siginfo_t si;
tracee = fork();
if (!tracee)
while (1)
pause();
kill(tracee, SIGSTOP);
waitid(P_PID, tracee, &si, WSTOPPED);
if (!fork()) {
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_DETACH, tracee, NULL, NULL);
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG);
if (si.si_pid)
printf("st=%02d c=%02d\n", si.si_status, si.si_code);
}
return 0;
}
Before the patch, the latter waitid() in polling mode reports the
second stopped event generated by the implied SIGSTOP of
PTRACE_ATTACH.
st=19 c=05
^C
After the patch, the second event is not reported.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
*
|
|
|
|
* The condition can be distinguished by testing whether
|
|
|
|
* SIGNAL_STOP_STOPPED is already set. Don't generate
|
|
|
|
* group_exit_code in such case.
|
|
|
|
*
|
|
|
|
* This is not necessary for SIGNAL_STOP_CONTINUED because
|
|
|
|
* an intervening stop signal is required to cause two
|
|
|
|
* continued events regardless of ptrace.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
job control: Don't set group_stop exit_code if re-entering job control stop
While ptraced, a task may be resumed while the containing process is
still job control stopped. If the task receives another stop signal
in this state, it will still initiate group stop, which generates
group_exit_code, which the real parent would be able to see once the
ptracer detaches.
In this scenario, the real parent may see two consecutive CLD_STOPPED
events from two stop signals without intervening SIGCONT, which
normally is impossible.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
pid_t tracee;
siginfo_t si;
tracee = fork();
if (!tracee)
while (1)
pause();
kill(tracee, SIGSTOP);
waitid(P_PID, tracee, &si, WSTOPPED);
if (!fork()) {
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, (void *)(long)si.si_status);
waitid(P_PID, tracee, &si, WSTOPPED);
ptrace(PTRACE_DETACH, tracee, NULL, NULL);
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG);
if (si.si_pid)
printf("st=%02d c=%02d\n", si.si_status, si.si_code);
}
return 0;
}
Before the patch, the latter waitid() in polling mode reports the
second stopped event generated by the implied SIGSTOP of
PTRACE_ATTACH.
st=19 c=05
^C
After the patch, the second event is not reported.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
if (!(sig->flags & SIGNAL_STOP_STOPPED))
|
|
|
|
sig->group_exit_code = signr;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
sig->group_stop_count = 0;
|
|
|
|
|
|
|
|
if (task_set_jobctl_pending(current, signr | gstop))
|
|
|
|
sig->group_stop_count++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-01-24 06:55:56 +07:00
|
|
|
t = current;
|
|
|
|
while_each_thread(current, t) {
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
2006-03-29 07:11:22 +07:00
|
|
|
* Setting state to TASK_STOPPED for a group
|
|
|
|
* stop is always done with the siglock held,
|
|
|
|
* so this check has no races.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2011-06-02 16:14:00 +07:00
|
|
|
if (!task_is_stopped(t) &&
|
|
|
|
task_set_jobctl_pending(t, signr | gstop)) {
|
2009-09-24 05:56:53 +07:00
|
|
|
sig->group_stop_count++;
|
ptrace: implement TRAP_NOTIFY and use it for group stop events
Currently there's no way for ptracer to find out whether group stop
finished other than polling with INTERRUPT - GETSIGINFO - CONT
sequence. This patch implements group stop notification for ptracer
using STOP traps.
When group stop state of a seized tracee changes, JOBCTL_TRAP_NOTIFY
is set, which schedules a STOP trap which is sticky - it isn't cleared
by other traps and at least one STOP trap will happen eventually.
STOP trap is synchronization point for event notification and the
tracer can determine the current group stop state by looking at the
signal number portion of exit code (si_status from waitid(2) or
si_code from PTRACE_GETSIGINFO).
Notifications are generated both on start and end of group stops but,
because group stop participation always happens before STOP trap, this
doesn't cause an extra trap while tracee is participating in group
stop. The symmetry will be useful later.
Note that this notification works iff tracee is not trapped.
Currently there is no way to be notified of group stop state changes
while tracee is trapped. This will be addressed by a later patch.
An example program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_INTERRUPT 0x4207
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts1s = { .tv_sec = 1 };
int main(int argc, char **argv)
{
pid_t tracee, tracer;
int i;
tracee = fork();
if (!tracee)
while (1)
pause();
tracer = fork();
if (!tracer) {
siginfo_t si;
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
ptrace(PTRACE_INTERRUPT, tracee, NULL, NULL);
repeat:
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_GETSIGINFO, tracee, NULL, &si);
if (!si.si_code) {
printf("tracer: SIG %d\n", si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(unsigned long)si.si_signo);
goto repeat;
}
printf("tracer: stopped=%d signo=%d\n",
si.si_signo != SIGTRAP, si.si_signo);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
goto repeat;
}
for (i = 0; i < 3; i++) {
nanosleep(&ts1s, NULL);
printf("mother: SIGSTOP\n");
kill(tracee, SIGSTOP);
nanosleep(&ts1s, NULL);
printf("mother: SIGCONT\n");
kill(tracee, SIGCONT);
}
nanosleep(&ts1s, NULL);
kill(tracer, SIGKILL);
kill(tracee, SIGKILL);
return 0;
}
In the above program, tracer keeps tracee running and gets
notification of each group stop state changes.
# ./test-notify
tracer: stopped=0 signo=5
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
mother: SIGSTOP
tracer: SIG 19
tracer: stopped=1 signo=19
mother: SIGCONT
tracer: stopped=0 signo=5
tracer: SIG 18
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:17 +07:00
|
|
|
if (likely(!(t->ptrace & PT_SEIZED)))
|
|
|
|
signal_wake_up(t, 0);
|
|
|
|
else
|
|
|
|
ptrace_trap_notify(t);
|
2006-03-29 07:11:22 +07:00
|
|
|
}
|
2011-03-23 16:37:00 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2011-06-14 16:20:14 +07:00
|
|
|
|
2011-06-17 21:50:34 +07:00
|
|
|
if (likely(!current->ptrace)) {
|
2011-03-23 16:37:00 +07:00
|
|
|
int notify = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-03-23 16:37:00 +07:00
|
|
|
/*
|
|
|
|
* If there are no other threads in the group, or if there
|
|
|
|
* is a group stop in progress and we are the last to stop,
|
|
|
|
* report to the parent.
|
|
|
|
*/
|
|
|
|
if (task_participate_group_stop(current))
|
|
|
|
notify = CLD_STOPPED;
|
|
|
|
|
2009-09-24 05:56:53 +07:00
|
|
|
__set_current_state(TASK_STOPPED);
|
2011-03-23 16:37:00 +07:00
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
2011-03-23 16:37:01 +07:00
|
|
|
/*
|
|
|
|
* Notify the parent of the group stop completion. Because
|
|
|
|
* we're not holding either the siglock or tasklist_lock
|
|
|
|
* here, ptracer may attach inbetween; however, this is for
|
|
|
|
* group stop and should always be delivered to the real
|
|
|
|
* parent of the group leader. The new ptracer will get
|
|
|
|
* its notification when this task transitions into
|
|
|
|
* TASK_TRACED.
|
|
|
|
*/
|
2011-03-23 16:37:00 +07:00
|
|
|
if (notify) {
|
|
|
|
read_lock(&tasklist_lock);
|
2011-03-23 16:37:01 +07:00
|
|
|
do_notify_parent_cldstop(current, false, notify);
|
2011-03-23 16:37:00 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we don't run again until woken by SIGCONT or SIGKILL */
|
2012-10-27 00:46:06 +07:00
|
|
|
freezable_schedule();
|
2011-06-14 16:20:14 +07:00
|
|
|
return true;
|
2011-03-23 16:37:00 +07:00
|
|
|
} else {
|
2011-06-14 16:20:14 +07:00
|
|
|
/*
|
|
|
|
* While ptraced, group stop is handled by STOP trap.
|
|
|
|
* Schedule it and let the caller deal with it.
|
|
|
|
*/
|
|
|
|
task_set_jobctl_pending(current, JOBCTL_TRAP_STOP);
|
|
|
|
return false;
|
2009-09-24 05:56:53 +07:00
|
|
|
}
|
2011-06-14 16:20:14 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-06-14 16:20:14 +07:00
|
|
|
/**
|
|
|
|
* do_jobctl_trap - take care of ptrace jobctl traps
|
|
|
|
*
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
* When PT_SEIZED, it's used for both group stop and explicit
|
|
|
|
* SEIZE/INTERRUPT traps. Both generate PTRACE_EVENT_STOP trap with
|
|
|
|
* accompanying siginfo. If stopped, lower eight bits of exit_code contain
|
|
|
|
* the stop signal; otherwise, %SIGTRAP.
|
|
|
|
*
|
|
|
|
* When !PT_SEIZED, it's used only for group stop trap with stop signal
|
|
|
|
* number as exit_code and no siginfo.
|
2011-06-14 16:20:14 +07:00
|
|
|
*
|
|
|
|
* CONTEXT:
|
|
|
|
* Must be called with @current->sighand->siglock held, which may be
|
|
|
|
* released and re-acquired before returning with intervening sleep.
|
|
|
|
*/
|
|
|
|
static void do_jobctl_trap(void)
|
|
|
|
{
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
struct signal_struct *signal = current->signal;
|
2011-06-14 16:20:14 +07:00
|
|
|
int signr = current->jobctl & JOBCTL_STOP_SIGMASK;
|
2009-09-24 05:56:53 +07:00
|
|
|
|
ptrace: implement PTRACE_SEIZE
PTRACE_ATTACH implicitly issues SIGSTOP on attach which has side
effects on tracee signal and job control states. This patch
implements a new ptrace request PTRACE_SEIZE which attaches a tracee
without trapping it or affecting its signal and job control states.
The usage is the same with PTRACE_ATTACH but it takes PTRACE_SEIZE_*
flags in @data. Currently, the only defined flag is
PTRACE_SEIZE_DEVEL which is a temporary flag to enable PTRACE_SEIZE.
PTRACE_SEIZE will change ptrace behaviors outside of attach itself.
The changes will be implemented gradually and the DEVEL flag is to
prevent programs which expect full SEIZE behavior from using it before
all the behavior modifications are complete while allowing unit
testing. The flag will be removed once SEIZE behaviors are completely
implemented.
* PTRACE_SEIZE, unlike ATTACH, doesn't force tracee to trap. After
attaching tracee continues to run unless a trap condition occurs.
* PTRACE_SEIZE doesn't affect signal or group stop state.
* If PTRACE_SEIZE'd, group stop uses PTRACE_EVENT_STOP trap which uses
exit_code of (signr | PTRACE_EVENT_STOP << 8) where signr is one of
the stopping signals if group stop is in effect or SIGTRAP
otherwise, and returns usual trap siginfo on PTRACE_GETSIGINFO
instead of NULL.
Seizing sets PT_SEIZED in ->ptrace of the tracee. This flag will be
used to determine whether new SEIZE behaviors should be enabled.
Test program follows.
#define PTRACE_SEIZE 0x4206
#define PTRACE_SEIZE_DEVEL 0x80000000
static const struct timespec ts100ms = { .tv_nsec = 100000000 };
static const struct timespec ts1s = { .tv_sec = 1 };
static const struct timespec ts3s = { .tv_sec = 3 };
int main(int argc, char **argv)
{
pid_t tracee;
tracee = fork();
if (tracee == 0) {
nanosleep(&ts100ms, NULL);
while (1) {
printf("tracee: alive\n");
nanosleep(&ts1s, NULL);
}
}
if (argc > 1)
kill(tracee, SIGSTOP);
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_SEIZE, tracee, NULL,
(void *)(unsigned long)PTRACE_SEIZE_DEVEL);
if (argc > 1) {
waitid(P_PID, tracee, NULL, WSTOPPED);
ptrace(PTRACE_CONT, tracee, NULL, NULL);
}
nanosleep(&ts3s, NULL);
printf("tracer: exiting\n");
return 0;
}
When the above program is called w/o argument, tracee is seized while
running and remains running. When tracer exits, tracee continues to
run and print out messages.
# ./test-seize-simple
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
tracee: alive
tracee: alive
When called with an argument, tracee is seized from stopped state and
continued, and returns to stopped state when tracer exits.
# ./test-seize
tracee: alive
tracee: alive
tracee: alive
tracer: exiting
# ps -el|grep test-seize
1 T 0 4720 1 0 80 0 - 941 signal ttyS0 00:00:00 test-seize
-v2: SEIZE doesn't schedule TRAP_STOP and leaves tracee running as Jan
suggested.
-v3: PTRACE_EVENT_STOP traps now report group stop state by signr. If
group stop is in effect the stop signal number is returned as
part of exit_code; otherwise, SIGTRAP. This was suggested by
Denys and Oleg.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
2011-06-14 16:20:15 +07:00
|
|
|
if (current->ptrace & PT_SEIZED) {
|
|
|
|
if (!signal->group_stop_count &&
|
|
|
|
!(signal->flags & SIGNAL_STOP_STOPPED))
|
|
|
|
signr = SIGTRAP;
|
|
|
|
WARN_ON_ONCE(!signr);
|
|
|
|
ptrace_do_notify(signr, signr | (PTRACE_EVENT_STOP << 8),
|
|
|
|
CLD_STOPPED);
|
|
|
|
} else {
|
|
|
|
WARN_ON_ONCE(!signr);
|
|
|
|
ptrace_stop(signr, CLD_STOPPED, 0, NULL);
|
|
|
|
current->exit_code = 0;
|
2009-09-24 05:56:53 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2012-11-06 01:08:06 +07:00
|
|
|
static int ptrace_signal(int signr, siginfo_t *info)
|
2008-04-18 08:44:38 +07:00
|
|
|
{
|
2012-11-06 01:06:22 +07:00
|
|
|
ptrace_signal_deliver();
|
ptrace: fix ptrace_signal() && STOP_DEQUEUED interaction
Simple test-case,
int main(void)
{
int pid, status;
pid = fork();
if (!pid) {
pause();
assert(0);
return 0x23;
}
assert(ptrace(PTRACE_ATTACH, pid, 0,0) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP);
kill(pid, SIGCONT); // <--- also clears STOP_DEQUEUD
assert(ptrace(PTRACE_CONT, pid, 0,0) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGCONT);
assert(ptrace(PTRACE_CONT, pid, 0, SIGSTOP) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP);
kill(pid, SIGKILL);
return 0;
}
Without the patch it hangs. After the patch SIGSTOP "injected" by the
tracer is not ignored and stops the tracee.
Note also that if this test-case uses, say, SIGWINCH instead of SIGCONT,
everything works without the patch. This can't be right, and this is
confusing.
The problem is that SIGSTOP (or any other sig_kernel_stop() signal) has
no effect without JOBCTL_STOP_DEQUEUED. This means it is simply ignored
after PTRACE_CONT unless JOBCTL_STOP_DEQUEUED was set "by accident", say
it wasn't cleared after initial SIGSTOP sent by PTRACE_ATTACH.
At first glance we could change ptrace_signal() to add STOP_DEQUEUED
after return from ptrace_stop(), but this is not right in case when the
tracer does not change the reported SIGSTOP and SIGCONT comes in between.
This is even more wrong with PT_SEIZED, SIGCONT adds JOBCTL_TRAP_NOTIFY
which will be "lost" during the TRAP_STOP | TRAP_NOTIFY report.
So lets add STOP_DEQUEUED _before_ we report the signal. It has no effect
unless sig_kernel_stop() == T after the tracer resumes us, and in the
latter case the pending STOP_DEQUEUED means no SIGCONT in between, we
should stop.
Note also that if SIGCONT was sent, PT_SEIZED tracee will correctly
report PTRACE_EVENT_STOP/SIGTRAP and thus the tracer can notice the fact
SIGSTOP was cancelled.
Also, move the current->ptrace check from ptrace_signal() to its caller,
get_signal_to_deliver(), this looks more natural.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
2011-07-21 22:06:53 +07:00
|
|
|
/*
|
|
|
|
* We do not check sig_kernel_stop(signr) but set this marker
|
|
|
|
* unconditionally because we do not know whether debugger will
|
|
|
|
* change signr. This flag has no meaning unless we are going
|
|
|
|
* to stop after return from ptrace_stop(). In this case it will
|
|
|
|
* be checked in do_signal_stop(), we should only stop if it was
|
|
|
|
* not cleared by SIGCONT while we were sleeping. See also the
|
|
|
|
* comment in dequeue_signal().
|
|
|
|
*/
|
|
|
|
current->jobctl |= JOBCTL_STOP_DEQUEUED;
|
2011-03-23 16:37:00 +07:00
|
|
|
ptrace_stop(signr, CLD_TRAPPED, 0, info);
|
2008-04-18 08:44:38 +07:00
|
|
|
|
|
|
|
/* We're back. Did the debugger cancel the sig? */
|
|
|
|
signr = current->exit_code;
|
|
|
|
if (signr == 0)
|
|
|
|
return signr;
|
|
|
|
|
|
|
|
current->exit_code = 0;
|
|
|
|
|
2011-04-05 04:59:31 +07:00
|
|
|
/*
|
|
|
|
* Update the siginfo structure if the signal has
|
|
|
|
* changed. If the debugger wanted something
|
|
|
|
* specific in the siginfo structure then it should
|
|
|
|
* have updated *info via PTRACE_SETSIGINFO.
|
|
|
|
*/
|
2008-04-18 08:44:38 +07:00
|
|
|
if (signr != info->si_signo) {
|
|
|
|
info->si_signo = signr;
|
|
|
|
info->si_errno = 0;
|
|
|
|
info->si_code = SI_USER;
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
rcu_read_lock();
|
2008-04-18 08:44:38 +07:00
|
|
|
info->si_pid = task_pid_vnr(current->parent);
|
2012-03-14 06:04:35 +07:00
|
|
|
info->si_uid = from_kuid_munged(current_user_ns(),
|
|
|
|
task_uid(current->parent));
|
user namespace: make signal.c respect user namespaces
ipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient's
user namespace. (new, thanks Oleg)
__send_signal: convert current's uid to the recipient's user namespace
for any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks
again :)
do_notify_parent and do_notify_parent_cldstop: map task's uid to parent's
user namespace
ptrace_signal maps parent's uid into current's user namespace before
including in signal to current. IIUC Oleg has argued that this shouldn't
matter as the debugger will play with it, but it seems like not converting
the value currently being set is misleading.
Changelog:
Sep 20: Inspired by Oleg's suggestion, define map_cred_ns() helper to
simplify callers and help make clear what we are translating
(which uid into which namespace). Passing the target task would
make callers even easier to read, but we pass in user_ns because
current_user_ns() != task_cred_xxx(current, user_ns).
Sep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock
in ptrace_signal().
Sep 23: In send_signal(), detect when (user) signal is coming from an
ancestor or unrelated user namespace. Pass that on to __send_signal,
which sets si_uid to 0 or overflowuid if needed.
Oct 12: Base on Oleg's fixup_uid() patch. On top of that, handle all
SI_FROMKERNEL cases at callers, because we can't assume sender is
current in those cases.
Nov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid
Nov 10: (akpm) make the !CONFIG_USER_NS case clearer
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Subject: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Eric Biederman pointed out that passing info is a bug and could lead to a
NULL pointer deref to boot.
A collection of signal, securebits, filecaps, cap_bounds, and a few other
ltp tests passed with this kernel.
Changelog:
Nov 18: previous patch missed a leading '&'
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: ipc/mqueue: lock() => unlock() typo
There was a double lock typo introduced in b085f4bd6b21 "user namespace:
make signal.c respect user namespaces"
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-11 06:11:37 +07:00
|
|
|
rcu_read_unlock();
|
2008-04-18 08:44:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If the (new) signal is now blocked, requeue it. */
|
|
|
|
if (sigismember(¤t->blocked, signr)) {
|
|
|
|
specific_send_sig_info(signr, info, current);
|
|
|
|
signr = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return signr;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
|
|
|
|
struct pt_regs *regs, void *cookie)
|
|
|
|
{
|
2008-04-30 14:52:47 +07:00
|
|
|
struct sighand_struct *sighand = current->sighand;
|
|
|
|
struct signal_struct *signal = current->signal;
|
|
|
|
int signr;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-08-27 02:12:17 +07:00
|
|
|
if (unlikely(current->task_works))
|
|
|
|
task_work_run();
|
2012-07-15 17:10:52 +07:00
|
|
|
|
uprobes/core: Handle breakpoint and singlestep exceptions
Uprobes uses exception notifiers to get to know if a thread hit
a breakpoint or a singlestep exception.
When a thread hits a uprobe or is singlestepping post a uprobe
hit, the uprobe exception notifier sets its TIF_UPROBE bit,
which will then be checked on its return to userspace path
(do_notify_resume() ->uprobe_notify_resume()), where the
consumers handlers are run (in task context) based on the
defined filters.
Uprobe hits are thread specific and hence we need to maintain
information about if a task hit a uprobe, what uprobe was hit,
the slot where the original instruction was copied for xol so
that it can be singlestepped with appropriate fixups.
In some cases, special care is needed for instructions that are
executed out of line (xol). These are architecture specific
artefacts, such as handling RIP relative instructions on x86_64.
Since the instruction at which the uprobe was inserted is
executed out of line, architecture specific fixups are added so
that the thread continues normal execution in the presence of a
uprobe.
Postpone the signals until we execute the probed insn.
post_xol() path does a recalc_sigpending() before return to
user-mode, this ensures the signal can't be lost.
Uprobes relies on DIE_DEBUG notification to notify if a
singlestep is complete.
Adds x86 specific uprobe exception notifiers and appropriate
hooks needed to determine a uprobe hit and subsequent post
processing.
Add requisite x86 fixups for xol for uprobes. Specific cases
needing fixups include relative jumps (x86_64), calls, etc.
Where possible, we check and skip singlestepping the
breakpointed instructions. For now we skip single byte as well
as few multibyte nop instructions. However this can be extended
to other instructions too.
Credits to Oleg Nesterov for suggestions/patches related to
signal, breakpoint, singlestep handling code.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com>
Cc: Linux-mm <linux-mm@kvack.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120313180011.29771.89027.sendpatchset@srdronam.in.ibm.com
[ Performed various cleanliness edits ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2012-03-14 01:00:11 +07:00
|
|
|
if (unlikely(uprobe_deny_signal()))
|
|
|
|
return 0;
|
|
|
|
|
2008-03-04 11:22:05 +07:00
|
|
|
/*
|
2012-10-27 00:46:06 +07:00
|
|
|
* Do this once, we can't return to user-mode if freezing() == T.
|
|
|
|
* do_signal_stop() and ptrace_stop() do freezable_schedule() and
|
|
|
|
* thus do not need another check after return.
|
2008-03-04 11:22:05 +07:00
|
|
|
*/
|
2006-03-23 18:00:05 +07:00
|
|
|
try_to_freeze();
|
|
|
|
|
2012-10-27 00:46:06 +07:00
|
|
|
relock:
|
2008-04-30 14:52:47 +07:00
|
|
|
spin_lock_irq(&sighand->siglock);
|
2008-04-30 14:53:00 +07:00
|
|
|
/*
|
|
|
|
* Every stopped thread goes here after wakeup. Check to see if
|
|
|
|
* we should notify the parent, prepare_signal(SIGCONT) encodes
|
|
|
|
* the CLD_ si_code into SIGNAL_CLD_MASK bits.
|
|
|
|
*/
|
2008-04-30 14:52:47 +07:00
|
|
|
if (unlikely(signal->flags & SIGNAL_CLD_MASK)) {
|
2011-03-23 16:36:59 +07:00
|
|
|
int why;
|
|
|
|
|
|
|
|
if (signal->flags & SIGNAL_CLD_CONTINUED)
|
|
|
|
why = CLD_CONTINUED;
|
|
|
|
else
|
|
|
|
why = CLD_STOPPED;
|
|
|
|
|
2008-04-30 14:52:47 +07:00
|
|
|
signal->flags &= ~SIGNAL_CLD_MASK;
|
2008-04-30 14:52:44 +07:00
|
|
|
|
2009-09-24 05:56:53 +07:00
|
|
|
spin_unlock_irq(&sighand->siglock);
|
2008-07-26 09:45:54 +07:00
|
|
|
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
/*
|
|
|
|
* Notify the parent that we're continuing. This event is
|
|
|
|
* always per-process and doesn't make whole lot of sense
|
|
|
|
* for ptracers, who shouldn't consume the state via
|
|
|
|
* wait(2) either, but, for backward compatibility, notify
|
|
|
|
* the ptracer of the group leader too unless it's gonna be
|
|
|
|
* a duplicate.
|
|
|
|
*/
|
2011-03-23 16:37:00 +07:00
|
|
|
read_lock(&tasklist_lock);
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
do_notify_parent_cldstop(current, false, why);
|
|
|
|
|
2011-06-24 22:34:23 +07:00
|
|
|
if (ptrace_reparented(current->group_leader))
|
|
|
|
do_notify_parent_cldstop(current->group_leader,
|
|
|
|
true, why);
|
2011-03-23 16:37:00 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
job control: Notify the real parent of job control events regardless of ptrace
With recent changes, job control and ptrace stopped states are
properly separated and accessible to the real parent and the ptracer
respectively; however, notifications of job control stopped/continued
events to the real parent while ptraced are still missing.
A ptracee participates in group stop in ptrace_stop() but the
completion isn't notified. If participation results in completion of
group stop, notify the real parent of the event. The ptrace and group
stops are separate and can be handled as such.
However, when the real parent and the ptracer are in the same thread
group, only the ptrace stop event is visible through wait(2) and the
duplicate notifications are different from the current behavior and
are confusing. Suppress group stop notification in such cases.
The continued state is shared between the real parent and the ptracer
but is only meaningful to the real parent. Always notify the real
parent and notify the ptracer too for backward compatibility. Similar
to stop notification, if the real parent is the ptracer, suppress a
duplicate notification.
Test case follows.
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
int main(void)
{
const struct timespec ts100ms = { .tv_nsec = 100000000 };
pid_t tracee, tracer;
siginfo_t si;
int i;
tracee = fork();
if (tracee == 0) {
while (1) {
printf("tracee: SIGSTOP\n");
raise(SIGSTOP);
nanosleep(&ts100ms, NULL);
printf("tracee: SIGCONT\n");
raise(SIGCONT);
nanosleep(&ts100ms, NULL);
}
}
waitid(P_PID, tracee, &si, WSTOPPED | WNOHANG | WNOWAIT);
tracer = fork();
if (tracer == 0) {
nanosleep(&ts100ms, NULL);
ptrace(PTRACE_ATTACH, tracee, NULL, NULL);
for (i = 0; i < 11; i++) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED);
if (si.si_pid && si.si_code == CLD_TRAPPED)
ptrace(PTRACE_CONT, tracee, NULL,
(void *)(long)si.si_status);
}
printf("tracer: EXITING\n");
return 0;
}
while (1) {
si.si_pid = 0;
waitid(P_PID, tracee, &si, WSTOPPED | WCONTINUED | WEXITED);
if (si.si_pid)
printf("mommy : WAIT status=%02d code=%02d\n",
si.si_status, si.si_code);
}
return 0;
}
Before this patch, while ptraced, the real parent doesn't get
notifications for job control events, so although it can access those
events, the later waitid(2) call never wakes up.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracee: SIGCONT
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
After this patch, it works as expected.
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
mommy : WAIT status=19 code=05
tracee: SIGCONT
mommy : WAIT status=18 code=06
tracee: SIGSTOP
tracer: EXITING
mommy : WAIT status=19 code=05
^C
-v2: Oleg pointed out that
* Group stop notification to the real parent should also happen
when ptracer detach races with ptrace_stop().
* real_parent_is_ptracer() should be testing thread group
equality not the task itself as wait(2) and stop/cont
notifications are normally thread-group wide.
Both issues are fixed accordingly.
-v3: real_parent_is_ptracer() updated to test child->real_parent
instead of child->group_leader->real_parent per Oleg's
suggestion.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
2011-03-23 16:37:01 +07:00
|
|
|
|
2008-04-30 14:52:44 +07:00
|
|
|
goto relock;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
for (;;) {
|
|
|
|
struct k_sigaction *ka;
|
2009-12-16 07:47:26 +07:00
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
if (unlikely(current->jobctl & JOBCTL_STOP_PENDING) &&
|
|
|
|
do_signal_stop(0))
|
2008-07-26 09:45:53 +07:00
|
|
|
goto relock;
|
2009-12-16 07:47:26 +07:00
|
|
|
|
2011-06-14 16:20:14 +07:00
|
|
|
if (unlikely(current->jobctl & JOBCTL_TRAP_MASK)) {
|
|
|
|
do_jobctl_trap();
|
|
|
|
spin_unlock_irq(&sighand->siglock);
|
|
|
|
goto relock;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
signr = dequeue_signal(current, ¤t->blocked, info);
|
2008-07-26 09:45:53 +07:00
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
if (!signr)
|
|
|
|
break; /* will return 0 */
|
2008-07-26 09:45:53 +07:00
|
|
|
|
ptrace: fix ptrace_signal() && STOP_DEQUEUED interaction
Simple test-case,
int main(void)
{
int pid, status;
pid = fork();
if (!pid) {
pause();
assert(0);
return 0x23;
}
assert(ptrace(PTRACE_ATTACH, pid, 0,0) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP);
kill(pid, SIGCONT); // <--- also clears STOP_DEQUEUD
assert(ptrace(PTRACE_CONT, pid, 0,0) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGCONT);
assert(ptrace(PTRACE_CONT, pid, 0, SIGSTOP) == 0);
assert(wait(&status) == pid);
assert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP);
kill(pid, SIGKILL);
return 0;
}
Without the patch it hangs. After the patch SIGSTOP "injected" by the
tracer is not ignored and stops the tracee.
Note also that if this test-case uses, say, SIGWINCH instead of SIGCONT,
everything works without the patch. This can't be right, and this is
confusing.
The problem is that SIGSTOP (or any other sig_kernel_stop() signal) has
no effect without JOBCTL_STOP_DEQUEUED. This means it is simply ignored
after PTRACE_CONT unless JOBCTL_STOP_DEQUEUED was set "by accident", say
it wasn't cleared after initial SIGSTOP sent by PTRACE_ATTACH.
At first glance we could change ptrace_signal() to add STOP_DEQUEUED
after return from ptrace_stop(), but this is not right in case when the
tracer does not change the reported SIGSTOP and SIGCONT comes in between.
This is even more wrong with PT_SEIZED, SIGCONT adds JOBCTL_TRAP_NOTIFY
which will be "lost" during the TRAP_STOP | TRAP_NOTIFY report.
So lets add STOP_DEQUEUED _before_ we report the signal. It has no effect
unless sig_kernel_stop() == T after the tracer resumes us, and in the
latter case the pending STOP_DEQUEUED means no SIGCONT in between, we
should stop.
Note also that if SIGCONT was sent, PT_SEIZED tracee will correctly
report PTRACE_EVENT_STOP/SIGTRAP and thus the tracer can notice the fact
SIGSTOP was cancelled.
Also, move the current->ptrace check from ptrace_signal() to its caller,
get_signal_to_deliver(), this looks more natural.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
2011-07-21 22:06:53 +07:00
|
|
|
if (unlikely(current->ptrace) && signr != SIGKILL) {
|
2012-11-06 01:08:06 +07:00
|
|
|
signr = ptrace_signal(signr, info);
|
2011-06-02 16:14:00 +07:00
|
|
|
if (!signr)
|
|
|
|
continue;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-06-02 16:14:00 +07:00
|
|
|
ka = &sighand->action[signr-1];
|
|
|
|
|
2009-11-25 04:56:51 +07:00
|
|
|
/* Trace actually delivered signals. */
|
|
|
|
trace_signal_deliver(signr, info, ka);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (ka->sa.sa_handler == SIG_IGN) /* Do nothing. */
|
|
|
|
continue;
|
|
|
|
if (ka->sa.sa_handler != SIG_DFL) {
|
|
|
|
/* Run the handler. */
|
|
|
|
*return_ka = *ka;
|
|
|
|
|
|
|
|
if (ka->sa.sa_flags & SA_ONESHOT)
|
|
|
|
ka->sa.sa_handler = SIG_DFL;
|
|
|
|
|
|
|
|
break; /* will return non-zero "signr" value */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we are doing the default action for this signal.
|
|
|
|
*/
|
|
|
|
if (sig_kernel_ignore(signr)) /* Default is nothing. */
|
|
|
|
continue;
|
|
|
|
|
2006-12-08 17:38:01 +07:00
|
|
|
/*
|
2007-10-19 13:40:13 +07:00
|
|
|
* Global init gets no signals it doesn't want.
|
2009-04-03 06:58:08 +07:00
|
|
|
* Container-init gets no signals it doesn't want from same
|
|
|
|
* container.
|
|
|
|
*
|
|
|
|
* Note that if global/container-init sees a sig_kernel_only()
|
|
|
|
* signal here, the signal must have been generated internally
|
|
|
|
* or must have come from an ancestor namespace. In either
|
|
|
|
* case, the signal cannot be dropped.
|
2006-12-08 17:38:01 +07:00
|
|
|
*/
|
2008-04-30 14:53:03 +07:00
|
|
|
if (unlikely(signal->flags & SIGNAL_UNKILLABLE) &&
|
2009-04-03 06:58:08 +07:00
|
|
|
!sig_kernel_only(signr))
|
2005-04-17 05:20:36 +07:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (sig_kernel_stop(signr)) {
|
|
|
|
/*
|
|
|
|
* The default action is to stop all threads in
|
|
|
|
* the thread group. The job control signals
|
|
|
|
* do nothing in an orphaned pgrp, but SIGSTOP
|
|
|
|
* always works. Note that siglock needs to be
|
|
|
|
* dropped during the call to is_orphaned_pgrp()
|
|
|
|
* because of lock ordering with tasklist_lock.
|
|
|
|
* This allows an intervening SIGCONT to be posted.
|
|
|
|
* We need to check for that and bail out if necessary.
|
|
|
|
*/
|
|
|
|
if (signr != SIGSTOP) {
|
2008-04-30 14:52:47 +07:00
|
|
|
spin_unlock_irq(&sighand->siglock);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/* signals can be posted during this window */
|
|
|
|
|
2007-02-12 15:52:58 +07:00
|
|
|
if (is_current_pgrp_orphaned())
|
2005-04-17 05:20:36 +07:00
|
|
|
goto relock;
|
|
|
|
|
2008-04-30 14:52:47 +07:00
|
|
|
spin_lock_irq(&sighand->siglock);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-07-26 09:45:53 +07:00
|
|
|
if (likely(do_signal_stop(info->si_signo))) {
|
2005-04-17 05:20:36 +07:00
|
|
|
/* It released the siglock. */
|
|
|
|
goto relock;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We didn't actually stop, due to a race
|
|
|
|
* with SIGCONT or something like that.
|
|
|
|
*/
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2008-04-30 14:52:47 +07:00
|
|
|
spin_unlock_irq(&sighand->siglock);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Anything else is fatal, maybe with a core dump.
|
|
|
|
*/
|
|
|
|
current->flags |= PF_SIGNALED;
|
2008-04-30 14:52:58 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (sig_kernel_coredump(signr)) {
|
2008-04-30 14:52:58 +07:00
|
|
|
if (print_fatal_signals)
|
2012-11-06 01:09:56 +07:00
|
|
|
print_fatal_signal(info->si_signo);
|
2013-03-20 03:50:05 +07:00
|
|
|
proc_coredump_connector(current);
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* If it was able to dump core, this kills all
|
|
|
|
* other threads in the group and synchronizes with
|
|
|
|
* their demise. If we lost the race with another
|
|
|
|
* thread getting here, it set group_exit_code
|
|
|
|
* first and our do_group_exit call below will use
|
|
|
|
* that value and ignore the one we pass it.
|
|
|
|
*/
|
2012-11-06 01:11:26 +07:00
|
|
|
do_coredump(info);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Death signals, no core dump.
|
|
|
|
*/
|
2008-07-26 09:45:53 +07:00
|
|
|
do_group_exit(info->si_signo);
|
2005-04-17 05:20:36 +07:00
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
2008-04-30 14:52:47 +07:00
|
|
|
spin_unlock_irq(&sighand->siglock);
|
2005-04-17 05:20:36 +07:00
|
|
|
return signr;
|
|
|
|
}
|
|
|
|
|
2012-01-11 06:11:17 +07:00
|
|
|
/**
|
2012-04-28 13:04:15 +07:00
|
|
|
* signal_delivered -
|
|
|
|
* @sig: number of signal being delivered
|
|
|
|
* @info: siginfo_t of signal being delivered
|
|
|
|
* @ka: sigaction setting that chose the handler
|
|
|
|
* @regs: user register state
|
|
|
|
* @stepping: nonzero if debugger single-step or block-step in use
|
2012-01-11 06:11:17 +07:00
|
|
|
*
|
2014-02-18 20:54:36 +07:00
|
|
|
* This function should be called when a signal has successfully been
|
2012-04-28 13:04:15 +07:00
|
|
|
* delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask
|
|
|
|
* is always blocked, and the signal itself is blocked unless %SA_NODEFER
|
|
|
|
* is set in @ka->sa.sa_flags. Tracing is notified.
|
2012-01-11 06:11:17 +07:00
|
|
|
*/
|
2012-04-28 13:04:15 +07:00
|
|
|
void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka,
|
|
|
|
struct pt_regs *regs, int stepping)
|
2012-01-11 06:11:17 +07:00
|
|
|
{
|
|
|
|
sigset_t blocked;
|
|
|
|
|
2012-05-22 10:42:15 +07:00
|
|
|
/* A signal was successfully delivered, and the
|
|
|
|
saved sigmask was stored on the signal frame,
|
|
|
|
and will be restored by sigreturn. So we can
|
|
|
|
simply clear the restore sigmask flag. */
|
|
|
|
clear_restore_sigmask();
|
|
|
|
|
2012-01-11 06:11:17 +07:00
|
|
|
sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask);
|
|
|
|
if (!(ka->sa.sa_flags & SA_NODEFER))
|
2012-04-28 13:04:15 +07:00
|
|
|
sigaddset(&blocked, sig);
|
2012-01-11 06:11:17 +07:00
|
|
|
set_current_blocked(&blocked);
|
2012-04-28 13:04:15 +07:00
|
|
|
tracehook_signal_handler(sig, info, ka, regs, stepping);
|
2012-01-11 06:11:17 +07:00
|
|
|
}
|
|
|
|
|
2012-11-08 03:11:25 +07:00
|
|
|
void signal_setup_done(int failed, struct ksignal *ksig, int stepping)
|
|
|
|
{
|
|
|
|
if (failed)
|
|
|
|
force_sigsegv(ksig->sig, current);
|
|
|
|
else
|
|
|
|
signal_delivered(ksig->sig, &ksig->info, &ksig->ka,
|
|
|
|
signal_pt_regs(), stepping);
|
|
|
|
}
|
|
|
|
|
2011-04-28 00:17:37 +07:00
|
|
|
/*
|
|
|
|
* It could be that complete_signal() picked us to notify about the
|
2011-04-28 00:50:21 +07:00
|
|
|
* group-wide signal. Other threads should be notified now to take
|
|
|
|
* the shared signals in @which since we will not.
|
2011-04-28 00:17:37 +07:00
|
|
|
*/
|
2011-04-28 00:18:39 +07:00
|
|
|
static void retarget_shared_pending(struct task_struct *tsk, sigset_t *which)
|
2011-04-28 00:17:37 +07:00
|
|
|
{
|
2011-04-28 00:18:39 +07:00
|
|
|
sigset_t retarget;
|
2011-04-28 00:17:37 +07:00
|
|
|
struct task_struct *t;
|
|
|
|
|
2011-04-28 00:18:39 +07:00
|
|
|
sigandsets(&retarget, &tsk->signal->shared_pending.signal, which);
|
|
|
|
if (sigisemptyset(&retarget))
|
|
|
|
return;
|
|
|
|
|
2011-04-28 00:17:37 +07:00
|
|
|
t = tsk;
|
|
|
|
while_each_thread(tsk, t) {
|
2011-04-28 00:50:21 +07:00
|
|
|
if (t->flags & PF_EXITING)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!has_pending_signals(&retarget, &t->blocked))
|
|
|
|
continue;
|
|
|
|
/* Remove the signals this thread can handle. */
|
|
|
|
sigandsets(&retarget, &retarget, &t->blocked);
|
|
|
|
|
|
|
|
if (!signal_pending(t))
|
|
|
|
signal_wake_up(t, 0);
|
|
|
|
|
|
|
|
if (sigisemptyset(&retarget))
|
|
|
|
break;
|
2011-04-28 00:17:37 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-08 19:19:12 +07:00
|
|
|
void exit_signals(struct task_struct *tsk)
|
|
|
|
{
|
|
|
|
int group_stop = 0;
|
2011-04-28 00:18:39 +07:00
|
|
|
sigset_t unblocked;
|
2008-02-08 19:19:12 +07:00
|
|
|
|
2011-12-13 09:12:21 +07:00
|
|
|
/*
|
|
|
|
* @tsk is about to have PF_EXITING set - lock out users which
|
|
|
|
* expect stable threadgroup.
|
|
|
|
*/
|
|
|
|
threadgroup_change_begin(tsk);
|
|
|
|
|
2008-02-08 19:19:13 +07:00
|
|
|
if (thread_group_empty(tsk) || signal_group_exit(tsk->signal)) {
|
|
|
|
tsk->flags |= PF_EXITING;
|
2011-12-13 09:12:21 +07:00
|
|
|
threadgroup_change_end(tsk);
|
2008-02-08 19:19:13 +07:00
|
|
|
return;
|
2008-02-08 19:19:12 +07:00
|
|
|
}
|
|
|
|
|
2008-02-08 19:19:13 +07:00
|
|
|
spin_lock_irq(&tsk->sighand->siglock);
|
2008-02-08 19:19:12 +07:00
|
|
|
/*
|
|
|
|
* From now this task is not visible for group-wide signals,
|
|
|
|
* see wants_signal(), do_signal_stop().
|
|
|
|
*/
|
|
|
|
tsk->flags |= PF_EXITING;
|
2011-12-13 09:12:21 +07:00
|
|
|
|
|
|
|
threadgroup_change_end(tsk);
|
|
|
|
|
2008-02-08 19:19:13 +07:00
|
|
|
if (!signal_pending(tsk))
|
|
|
|
goto out;
|
|
|
|
|
2011-04-28 00:18:39 +07:00
|
|
|
unblocked = tsk->blocked;
|
|
|
|
signotset(&unblocked);
|
|
|
|
retarget_shared_pending(tsk, &unblocked);
|
2008-02-08 19:19:13 +07:00
|
|
|
|
2011-06-02 16:13:59 +07:00
|
|
|
if (unlikely(tsk->jobctl & JOBCTL_STOP_PENDING) &&
|
signal: Fix premature completion of group stop when interfered by ptrace
task->signal->group_stop_count is used to track the progress of group
stop. It's initialized to the number of tasks which need to stop for
group stop to finish and each stopping or trapping task decrements.
However, each task doesn't keep track of whether it decremented the
counter or not and if woken up before the group stop is complete and
stops again, it can decrement the counter multiple times.
Please consider the following example code.
static void *worker(void *arg)
{
while (1) ;
return NULL;
}
int main(void)
{
pthread_t thread;
pid_t pid;
int i;
pid = fork();
if (!pid) {
for (i = 0; i < 5; i++)
pthread_create(&thread, NULL, worker, NULL);
while (1) ;
return 0;
}
ptrace(PTRACE_ATTACH, pid, NULL, NULL);
while (1) {
waitid(P_PID, pid, NULL, WSTOPPED);
ptrace(PTRACE_SINGLESTEP, pid, NULL, (void *)(long)SIGSTOP);
}
return 0;
}
The child creates five threads and the parent continuously traps the
first thread and whenever the child gets a signal, SIGSTOP is
delivered. If an external process sends SIGSTOP to the child, all
other threads in the process should reliably stop. However, due to
the above bug, the first thread will often end up consuming
group_stop_count multiple times and SIGSTOP often ends up stopping
none or part of the other four threads.
This patch adds a new field task->group_stop which is protected by
siglock and uses GROUP_STOP_CONSUME flag to track which task is still
to consume group_stop_count to fix this bug.
task_clear_group_stop_pending() and task_participate_group_stop() are
added to help manipulating group stop states. As ptrace_stop() now
also uses task_participate_group_stop(), it will set
SIGNAL_STOP_STOPPED if it completes a group stop.
There still are many issues regarding the interaction between group
stop and ptrace. Patches to address them will follow.
- Oleg spotted duplicate GROUP_STOP_CONSUME. Dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
2011-03-23 16:37:00 +07:00
|
|
|
task_participate_group_stop(tsk))
|
2011-03-23 16:37:00 +07:00
|
|
|
group_stop = CLD_STOPPED;
|
2008-02-08 19:19:13 +07:00
|
|
|
out:
|
2008-02-08 19:19:12 +07:00
|
|
|
spin_unlock_irq(&tsk->sighand->siglock);
|
|
|
|
|
2011-03-23 16:37:01 +07:00
|
|
|
/*
|
|
|
|
* If group stop has completed, deliver the notification. This
|
|
|
|
* should always go to the real parent of the group leader.
|
|
|
|
*/
|
2009-09-24 05:56:53 +07:00
|
|
|
if (unlikely(group_stop)) {
|
2008-02-08 19:19:12 +07:00
|
|
|
read_lock(&tasklist_lock);
|
2011-03-23 16:37:01 +07:00
|
|
|
do_notify_parent_cldstop(tsk, false, group_stop);
|
2008-02-08 19:19:12 +07:00
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
EXPORT_SYMBOL(recalc_sigpending);
|
|
|
|
EXPORT_SYMBOL_GPL(dequeue_signal);
|
|
|
|
EXPORT_SYMBOL(flush_signals);
|
|
|
|
EXPORT_SYMBOL(force_sig);
|
|
|
|
EXPORT_SYMBOL(send_sig);
|
|
|
|
EXPORT_SYMBOL(send_sig_info);
|
|
|
|
EXPORT_SYMBOL(sigprocmask);
|
|
|
|
EXPORT_SYMBOL(block_all_signals);
|
|
|
|
EXPORT_SYMBOL(unblock_all_signals);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* System call entry points.
|
|
|
|
*/
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_restart_syscall - restart a system call
|
|
|
|
*/
|
2009-01-14 20:14:09 +07:00
|
|
|
SYSCALL_DEFINE0(restart_syscall)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct restart_block *restart = ¤t_thread_info()->restart_block;
|
|
|
|
return restart->fn(restart);
|
|
|
|
}
|
|
|
|
|
|
|
|
long do_no_restart_syscall(struct restart_block *param)
|
|
|
|
{
|
|
|
|
return -EINTR;
|
|
|
|
}
|
|
|
|
|
2011-04-28 02:56:14 +07:00
|
|
|
static void __set_task_blocked(struct task_struct *tsk, const sigset_t *newset)
|
|
|
|
{
|
|
|
|
if (signal_pending(tsk) && !thread_group_empty(tsk)) {
|
|
|
|
sigset_t newblocked;
|
|
|
|
/* A set of now blocked but previously unblocked signals. */
|
2011-04-28 03:01:27 +07:00
|
|
|
sigandnsets(&newblocked, newset, ¤t->blocked);
|
2011-04-28 02:56:14 +07:00
|
|
|
retarget_shared_pending(tsk, &newblocked);
|
|
|
|
}
|
|
|
|
tsk->blocked = *newset;
|
|
|
|
recalc_sigpending();
|
|
|
|
}
|
|
|
|
|
signal: sigprocmask() should do retarget_shared_pending()
In short, almost every changing of current->blocked is wrong, or at least
can lead to the unexpected results.
For example. Two threads T1 and T2, T1 sleeps in sigtimedwait/pause/etc.
kill(tgid, SIG) can pick T2 for TIF_SIGPENDING. If T2 calls sigprocmask()
and blocks SIG before it notices the pending signal, nobody else can handle
this pending shared signal.
I am not sure this is bug, but at least this looks strange imho. T1 should
not sleep forever, there is a signal which should wake it up.
This patch moves the code which actually changes ->blocked into the new
helper, set_current_blocked() and changes this code to call
retarget_shared_pending() as exit_signals() does. We should only care about
the signals we just blocked, we use "newset & ~current->blocked" as a mask.
We do not check !sigisemptyset(newblocked), retarget_shared_pending() is
cheap unless mask & shared_pending.
Note: for this particular case we could simply change sigprocmask() to
return -EINTR if signal_pending(), but then we should change other callers
and, more importantly, if we need this fix then set_current_blocked() will
have more callers and some of them can't restart. See the next patch as a
random example.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Matt Fleming <matt.fleming@linux.intel.com>
Acked-by: Tejun Heo <tj@kernel.org>
2011-04-28 01:59:41 +07:00
|
|
|
/**
|
|
|
|
* set_current_blocked - change current->blocked mask
|
|
|
|
* @newset: new mask
|
|
|
|
*
|
|
|
|
* It is wrong to change ->blocked directly, this helper should be used
|
|
|
|
* to ensure the process can't miss a shared signal we are going to block.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2012-04-28 00:58:59 +07:00
|
|
|
void set_current_blocked(sigset_t *newset)
|
|
|
|
{
|
|
|
|
sigdelsetmask(newset, sigmask(SIGKILL) | sigmask(SIGSTOP));
|
2013-01-06 01:13:29 +07:00
|
|
|
__set_current_blocked(newset);
|
2012-04-28 00:58:59 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void __set_current_blocked(const sigset_t *newset)
|
signal: sigprocmask() should do retarget_shared_pending()
In short, almost every changing of current->blocked is wrong, or at least
can lead to the unexpected results.
For example. Two threads T1 and T2, T1 sleeps in sigtimedwait/pause/etc.
kill(tgid, SIG) can pick T2 for TIF_SIGPENDING. If T2 calls sigprocmask()
and blocks SIG before it notices the pending signal, nobody else can handle
this pending shared signal.
I am not sure this is bug, but at least this looks strange imho. T1 should
not sleep forever, there is a signal which should wake it up.
This patch moves the code which actually changes ->blocked into the new
helper, set_current_blocked() and changes this code to call
retarget_shared_pending() as exit_signals() does. We should only care about
the signals we just blocked, we use "newset & ~current->blocked" as a mask.
We do not check !sigisemptyset(newblocked), retarget_shared_pending() is
cheap unless mask & shared_pending.
Note: for this particular case we could simply change sigprocmask() to
return -EINTR if signal_pending(), but then we should change other callers
and, more importantly, if we need this fix then set_current_blocked() will
have more callers and some of them can't restart. See the next patch as a
random example.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Matt Fleming <matt.fleming@linux.intel.com>
Acked-by: Tejun Heo <tj@kernel.org>
2011-04-28 01:59:41 +07:00
|
|
|
{
|
|
|
|
struct task_struct *tsk = current;
|
|
|
|
|
|
|
|
spin_lock_irq(&tsk->sighand->siglock);
|
2011-04-28 02:56:14 +07:00
|
|
|
__set_task_blocked(tsk, newset);
|
signal: sigprocmask() should do retarget_shared_pending()
In short, almost every changing of current->blocked is wrong, or at least
can lead to the unexpected results.
For example. Two threads T1 and T2, T1 sleeps in sigtimedwait/pause/etc.
kill(tgid, SIG) can pick T2 for TIF_SIGPENDING. If T2 calls sigprocmask()
and blocks SIG before it notices the pending signal, nobody else can handle
this pending shared signal.
I am not sure this is bug, but at least this looks strange imho. T1 should
not sleep forever, there is a signal which should wake it up.
This patch moves the code which actually changes ->blocked into the new
helper, set_current_blocked() and changes this code to call
retarget_shared_pending() as exit_signals() does. We should only care about
the signals we just blocked, we use "newset & ~current->blocked" as a mask.
We do not check !sigisemptyset(newblocked), retarget_shared_pending() is
cheap unless mask & shared_pending.
Note: for this particular case we could simply change sigprocmask() to
return -EINTR if signal_pending(), but then we should change other callers
and, more importantly, if we need this fix then set_current_blocked() will
have more callers and some of them can't restart. See the next patch as a
random example.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Matt Fleming <matt.fleming@linux.intel.com>
Acked-by: Tejun Heo <tj@kernel.org>
2011-04-28 01:59:41 +07:00
|
|
|
spin_unlock_irq(&tsk->sighand->siglock);
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is also useful for kernel threads that want to temporarily
|
|
|
|
* (or permanently) block certain signals.
|
|
|
|
*
|
|
|
|
* NOTE! Unlike the user-mode sys_sigprocmask(), the kernel
|
|
|
|
* interface happily blocks "unblockable" signals like SIGKILL
|
|
|
|
* and friends.
|
|
|
|
*/
|
|
|
|
int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
|
|
|
|
{
|
2011-04-28 00:54:20 +07:00
|
|
|
struct task_struct *tsk = current;
|
|
|
|
sigset_t newset;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 00:54:20 +07:00
|
|
|
/* Lockless, only current can change ->blocked, never from irq */
|
2006-03-23 18:00:49 +07:00
|
|
|
if (oldset)
|
2011-04-28 00:54:20 +07:00
|
|
|
*oldset = tsk->blocked;
|
2006-03-23 18:00:49 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
switch (how) {
|
|
|
|
case SIG_BLOCK:
|
2011-04-28 00:54:20 +07:00
|
|
|
sigorsets(&newset, &tsk->blocked, set);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
case SIG_UNBLOCK:
|
2011-04-28 03:01:27 +07:00
|
|
|
sigandnsets(&newset, &tsk->blocked, set);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
case SIG_SETMASK:
|
2011-04-28 00:54:20 +07:00
|
|
|
newset = *set;
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
default:
|
2011-04-28 00:54:20 +07:00
|
|
|
return -EINVAL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-03-23 18:00:49 +07:00
|
|
|
|
2012-04-28 00:58:59 +07:00
|
|
|
__set_current_blocked(&newset);
|
2011-04-28 00:54:20 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigprocmask - change the list of currently blocked signals
|
|
|
|
* @how: whether to add, remove, or set signals
|
2011-06-15 05:50:11 +07:00
|
|
|
* @nset: stores pending signals
|
2011-04-05 05:00:26 +07:00
|
|
|
* @oset: previous value of signal mask if non-null
|
|
|
|
* @sigsetsize: size of sigset_t type
|
|
|
|
*/
|
2011-04-28 02:18:10 +07:00
|
|
|
SYSCALL_DEFINE4(rt_sigprocmask, int, how, sigset_t __user *, nset,
|
2009-01-14 20:14:10 +07:00
|
|
|
sigset_t __user *, oset, size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
sigset_t old_set, new_set;
|
2011-04-28 02:18:10 +07:00
|
|
|
int error;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
2011-04-28 02:18:10 +07:00
|
|
|
return -EINVAL;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 02:18:10 +07:00
|
|
|
old_set = current->blocked;
|
|
|
|
|
|
|
|
if (nset) {
|
|
|
|
if (copy_from_user(&new_set, nset, sizeof(sigset_t)))
|
|
|
|
return -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
sigdelsetmask(&new_set, sigmask(SIGKILL)|sigmask(SIGSTOP));
|
|
|
|
|
2011-04-28 02:18:10 +07:00
|
|
|
error = sigprocmask(how, &new_set, NULL);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (error)
|
2011-04-28 02:18:10 +07:00
|
|
|
return error;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 02:18:10 +07:00
|
|
|
if (oset) {
|
|
|
|
if (copy_to_user(oset, &old_set, sizeof(sigset_t)))
|
|
|
|
return -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2011-04-28 02:18:10 +07:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2012-12-26 01:32:58 +07:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset,
|
|
|
|
compat_sigset_t __user *, oset, compat_size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-12-26 01:32:58 +07:00
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
sigset_t old_set = current->blocked;
|
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (nset) {
|
|
|
|
compat_sigset_t new32;
|
|
|
|
sigset_t new_set;
|
|
|
|
int error;
|
|
|
|
if (copy_from_user(&new32, nset, sizeof(compat_sigset_t)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
sigset_from_compat(&new_set, &new32);
|
|
|
|
sigdelsetmask(&new_set, sigmask(SIGKILL)|sigmask(SIGSTOP));
|
|
|
|
|
|
|
|
error = sigprocmask(how, &new_set, NULL);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
if (oset) {
|
|
|
|
compat_sigset_t old32;
|
|
|
|
sigset_to_compat(&old32, &old_set);
|
2013-03-03 08:39:15 +07:00
|
|
|
if (copy_to_user(oset, &old32, sizeof(compat_sigset_t)))
|
2012-12-26 01:32:58 +07:00
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
#else
|
|
|
|
return sys_rt_sigprocmask(how, (sigset_t __user *)nset,
|
|
|
|
(sigset_t __user *)oset, sigsetsize);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-12-26 02:31:38 +07:00
|
|
|
static int do_sigpending(void *set, unsigned long sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
if (sigsetsize > sizeof(sigset_t))
|
2012-12-26 02:31:38 +07:00
|
|
|
return -EINVAL;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
2012-12-26 02:31:38 +07:00
|
|
|
sigorsets(set, ¤t->pending.signal,
|
2005-04-17 05:20:36 +07:00
|
|
|
¤t->signal->shared_pending.signal);
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
|
|
|
/* Outside the lock because only this thread touches it. */
|
2012-12-26 02:31:38 +07:00
|
|
|
sigandsets(set, ¤t->blocked, set);
|
|
|
|
return 0;
|
2011-04-05 04:59:31 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigpending - examine a pending signal that has been raised
|
|
|
|
* while blocked
|
2013-03-05 05:32:59 +07:00
|
|
|
* @uset: stores pending signals
|
2011-04-05 05:00:26 +07:00
|
|
|
* @sigsetsize: size of sigset_t type or larger
|
|
|
|
*/
|
2012-12-26 02:31:38 +07:00
|
|
|
SYSCALL_DEFINE2(rt_sigpending, sigset_t __user *, uset, size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-12-26 02:31:38 +07:00
|
|
|
sigset_t set;
|
|
|
|
int err = do_sigpending(&set, sigsetsize);
|
|
|
|
if (!err && copy_to_user(uset, &set, sigsetsize))
|
|
|
|
err = -EFAULT;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE2(rt_sigpending, compat_sigset_t __user *, uset,
|
|
|
|
compat_size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-12-26 02:31:38 +07:00
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
sigset_t set;
|
|
|
|
int err = do_sigpending(&set, sigsetsize);
|
|
|
|
if (!err) {
|
|
|
|
compat_sigset_t set32;
|
|
|
|
sigset_to_compat(&set32, &set);
|
|
|
|
/* we can get here only if sigsetsize <= sizeof(set) */
|
|
|
|
if (copy_to_user(uset, &set32, sigsetsize))
|
|
|
|
err = -EFAULT;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
#else
|
|
|
|
return sys_rt_sigpending((sigset_t __user *)uset, sigsetsize);
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2012-12-26 02:31:38 +07:00
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
#ifndef HAVE_ARCH_COPY_SIGINFO_TO_USER
|
|
|
|
|
2013-10-14 04:23:53 +07:00
|
|
|
int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!access_ok (VERIFY_WRITE, to, sizeof(siginfo_t)))
|
|
|
|
return -EFAULT;
|
|
|
|
if (from->si_code < 0)
|
|
|
|
return __copy_to_user(to, from, sizeof(siginfo_t))
|
|
|
|
? -EFAULT : 0;
|
|
|
|
/*
|
|
|
|
* If you change siginfo_t structure, please be sure
|
|
|
|
* this code is fixed accordingly.
|
signal/timer/event: signalfd core
This patch series implements the new signalfd() system call.
I took part of the original Linus code (and you know how badly it can be
broken :), and I added even more breakage ;) Signals are fetched from the same
signal queue used by the process, so signalfd will compete with standard
kernel delivery in dequeue_signal(). If you want to reliably fetch signals on
the signalfd file, you need to block them with sigprocmask(SIG_BLOCK). This
seems to be working fine on my Dual Opteron machine. I made a quick test
program for it:
http://www.xmailserver.org/signafd-test.c
The signalfd() system call implements signal delivery into a file descriptor
receiver. The signalfd file descriptor if created with the following API:
int signalfd(int ufd, const sigset_t *mask, size_t masksize);
The "ufd" parameter allows to change an existing signalfd sigmask, w/out going
to close/create cycle (Linus idea). Use "ufd" == -1 if you want a brand new
signalfd file.
The "mask" allows to specify the signal mask of signals that we are interested
in. The "masksize" parameter is the size of "mask".
The signalfd fd supports the poll(2) and read(2) system calls. The poll(2)
will return POLLIN when signals are available to be dequeued. As a direct
consequence of supporting the Linux poll subsystem, the signalfd fd can use
used together with epoll(2) too.
The read(2) system call will return a "struct signalfd_siginfo" structure in
the userspace supplied buffer. The return value is the number of bytes copied
in the supplied buffer, or -1 in case of error. The read(2) call can also
return 0, in case the sighand structure to which the signalfd was attached,
has been orphaned. The O_NONBLOCK flag is also supported, and read(2) will
return -EAGAIN in case no signal is available.
If the size of the buffer passed to read(2) is lower than sizeof(struct
signalfd_siginfo), -EINVAL is returned. A read from the signalfd can also
return -ERESTARTSYS in case a signal hits the process. The format of the
struct signalfd_siginfo is, and the valid fields depends of the (->code &
__SI_MASK) value, in the same way a struct siginfo would:
struct signalfd_siginfo {
__u32 signo; /* si_signo */
__s32 err; /* si_errno */
__s32 code; /* si_code */
__u32 pid; /* si_pid */
__u32 uid; /* si_uid */
__s32 fd; /* si_fd */
__u32 tid; /* si_fd */
__u32 band; /* si_band */
__u32 overrun; /* si_overrun */
__u32 trapno; /* si_trapno */
__s32 status; /* si_status */
__s32 svint; /* si_int */
__u64 svptr; /* si_ptr */
__u64 utime; /* si_utime */
__u64 stime; /* si_stime */
__u64 addr; /* si_addr */
};
[akpm@linux-foundation.org: fix signalfd_copyinfo() on i386]
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-11 12:23:13 +07:00
|
|
|
* Please remember to update the signalfd_copyinfo() function
|
|
|
|
* inside fs/signalfd.c too, in case siginfo_t changes.
|
2005-04-17 05:20:36 +07:00
|
|
|
* It should never copy any pad contained in the structure
|
|
|
|
* to avoid security leaks, but must copy the generic
|
|
|
|
* 3 ints plus the relevant union member.
|
|
|
|
*/
|
|
|
|
err = __put_user(from->si_signo, &to->si_signo);
|
|
|
|
err |= __put_user(from->si_errno, &to->si_errno);
|
|
|
|
err |= __put_user((short)from->si_code, &to->si_code);
|
|
|
|
switch (from->si_code & __SI_MASK) {
|
|
|
|
case __SI_KILL:
|
|
|
|
err |= __put_user(from->si_pid, &to->si_pid);
|
|
|
|
err |= __put_user(from->si_uid, &to->si_uid);
|
|
|
|
break;
|
|
|
|
case __SI_TIMER:
|
|
|
|
err |= __put_user(from->si_tid, &to->si_tid);
|
|
|
|
err |= __put_user(from->si_overrun, &to->si_overrun);
|
|
|
|
err |= __put_user(from->si_ptr, &to->si_ptr);
|
|
|
|
break;
|
|
|
|
case __SI_POLL:
|
|
|
|
err |= __put_user(from->si_band, &to->si_band);
|
|
|
|
err |= __put_user(from->si_fd, &to->si_fd);
|
|
|
|
break;
|
|
|
|
case __SI_FAULT:
|
|
|
|
err |= __put_user(from->si_addr, &to->si_addr);
|
|
|
|
#ifdef __ARCH_SI_TRAPNO
|
|
|
|
err |= __put_user(from->si_trapno, &to->si_trapno);
|
2010-09-28 01:32:19 +07:00
|
|
|
#endif
|
|
|
|
#ifdef BUS_MCEERR_AO
|
2011-04-05 04:59:31 +07:00
|
|
|
/*
|
2010-09-28 01:32:19 +07:00
|
|
|
* Other callers might not initialize the si_lsb field,
|
2011-04-05 04:59:31 +07:00
|
|
|
* so check explicitly for the right codes here.
|
2010-09-28 01:32:19 +07:00
|
|
|
*/
|
|
|
|
if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)
|
|
|
|
err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb);
|
2005-04-17 05:20:36 +07:00
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case __SI_CHLD:
|
|
|
|
err |= __put_user(from->si_pid, &to->si_pid);
|
|
|
|
err |= __put_user(from->si_uid, &to->si_uid);
|
|
|
|
err |= __put_user(from->si_status, &to->si_status);
|
|
|
|
err |= __put_user(from->si_utime, &to->si_utime);
|
|
|
|
err |= __put_user(from->si_stime, &to->si_stime);
|
|
|
|
break;
|
|
|
|
case __SI_RT: /* This is not generated by the kernel as of now. */
|
|
|
|
case __SI_MESGQ: /* But this is */
|
|
|
|
err |= __put_user(from->si_pid, &to->si_pid);
|
|
|
|
err |= __put_user(from->si_uid, &to->si_uid);
|
|
|
|
err |= __put_user(from->si_ptr, &to->si_ptr);
|
|
|
|
break;
|
2012-04-13 04:48:00 +07:00
|
|
|
#ifdef __ARCH_SIGSYS
|
|
|
|
case __SI_SYS:
|
|
|
|
err |= __put_user(from->si_call_addr, &to->si_call_addr);
|
|
|
|
err |= __put_user(from->si_syscall, &to->si_syscall);
|
|
|
|
err |= __put_user(from->si_arch, &to->si_arch);
|
|
|
|
break;
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
default: /* this is just in case for now ... */
|
|
|
|
err |= __put_user(from->si_pid, &to->si_pid);
|
|
|
|
err |= __put_user(from->si_uid, &to->si_uid);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2011-04-28 02:44:14 +07:00
|
|
|
/**
|
|
|
|
* do_sigtimedwait - wait for queued signals specified in @which
|
|
|
|
* @which: queued signals to wait for
|
|
|
|
* @info: if non-null, the signal's siginfo is returned here
|
|
|
|
* @ts: upper bound on process time suspension
|
|
|
|
*/
|
|
|
|
int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
|
|
|
|
const struct timespec *ts)
|
|
|
|
{
|
|
|
|
struct task_struct *tsk = current;
|
|
|
|
long timeout = MAX_SCHEDULE_TIMEOUT;
|
|
|
|
sigset_t mask = *which;
|
|
|
|
int sig;
|
|
|
|
|
|
|
|
if (ts) {
|
|
|
|
if (!timespec_valid(ts))
|
|
|
|
return -EINVAL;
|
|
|
|
timeout = timespec_to_jiffies(ts);
|
|
|
|
/*
|
|
|
|
* We can be close to the next tick, add another one
|
|
|
|
* to ensure we will wait at least the time asked for.
|
|
|
|
*/
|
|
|
|
if (ts->tv_sec || ts->tv_nsec)
|
|
|
|
timeout++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Invert the set of allowed signals to get those we want to block.
|
|
|
|
*/
|
|
|
|
sigdelsetmask(&mask, sigmask(SIGKILL) | sigmask(SIGSTOP));
|
|
|
|
signotset(&mask);
|
|
|
|
|
|
|
|
spin_lock_irq(&tsk->sighand->siglock);
|
|
|
|
sig = dequeue_signal(tsk, &mask, info);
|
|
|
|
if (!sig && timeout) {
|
|
|
|
/*
|
|
|
|
* None ready, temporarily unblock those we're interested
|
|
|
|
* while we are sleeping in so that we'll be awakened when
|
2011-04-28 02:56:14 +07:00
|
|
|
* they arrive. Unblocking is always fine, we can avoid
|
|
|
|
* set_current_blocked().
|
2011-04-28 02:44:14 +07:00
|
|
|
*/
|
|
|
|
tsk->real_blocked = tsk->blocked;
|
|
|
|
sigandsets(&tsk->blocked, &tsk->blocked, &mask);
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(&tsk->sighand->siglock);
|
|
|
|
|
2013-05-07 06:50:20 +07:00
|
|
|
timeout = freezable_schedule_timeout_interruptible(timeout);
|
2011-04-28 02:44:14 +07:00
|
|
|
|
|
|
|
spin_lock_irq(&tsk->sighand->siglock);
|
2011-04-28 02:56:14 +07:00
|
|
|
__set_task_blocked(tsk, &tsk->real_blocked);
|
2011-04-28 02:44:14 +07:00
|
|
|
siginitset(&tsk->real_blocked, 0);
|
2011-04-28 02:56:14 +07:00
|
|
|
sig = dequeue_signal(tsk, &mask, info);
|
2011-04-28 02:44:14 +07:00
|
|
|
}
|
|
|
|
spin_unlock_irq(&tsk->sighand->siglock);
|
|
|
|
|
|
|
|
if (sig)
|
|
|
|
return sig;
|
|
|
|
return timeout ? -EINTR : -EAGAIN;
|
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigtimedwait - synchronously wait for queued signals specified
|
|
|
|
* in @uthese
|
|
|
|
* @uthese: queued signals to wait for
|
|
|
|
* @uinfo: if non-null, the signal's siginfo is returned here
|
|
|
|
* @uts: upper bound on process time suspension
|
|
|
|
* @sigsetsize: size of sigset_t type
|
|
|
|
*/
|
2009-01-14 20:14:10 +07:00
|
|
|
SYSCALL_DEFINE4(rt_sigtimedwait, const sigset_t __user *, uthese,
|
|
|
|
siginfo_t __user *, uinfo, const struct timespec __user *, uts,
|
|
|
|
size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
sigset_t these;
|
|
|
|
struct timespec ts;
|
|
|
|
siginfo_t info;
|
2011-04-28 02:44:14 +07:00
|
|
|
int ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (copy_from_user(&these, uthese, sizeof(these)))
|
|
|
|
return -EFAULT;
|
2011-04-05 04:59:31 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (uts) {
|
|
|
|
if (copy_from_user(&ts, uts, sizeof(ts)))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
2011-04-28 02:44:14 +07:00
|
|
|
ret = do_sigtimedwait(&these, &info, uts ? &ts : NULL);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 02:44:14 +07:00
|
|
|
if (ret > 0 && uinfo) {
|
|
|
|
if (copy_siginfo_to_user(uinfo, &info))
|
|
|
|
ret = -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_kill - send a signal to a process
|
|
|
|
* @pid: the PID of the process
|
|
|
|
* @sig: signal to be sent
|
|
|
|
*/
|
2009-01-14 20:14:10 +07:00
|
|
|
SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct siginfo info;
|
|
|
|
|
|
|
|
info.si_signo = sig;
|
|
|
|
info.si_errno = 0;
|
|
|
|
info.si_code = SI_USER;
|
2007-10-19 13:40:14 +07:00
|
|
|
info.si_pid = task_tgid_vnr(current);
|
2012-02-08 22:00:08 +07:00
|
|
|
info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return kill_something_info(sig, &info, pid);
|
|
|
|
}
|
|
|
|
|
2009-04-05 04:01:01 +07:00
|
|
|
static int
|
|
|
|
do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct task_struct *p;
|
2009-04-05 04:01:01 +07:00
|
|
|
int error = -ESRCH;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:52:51 +07:00
|
|
|
rcu_read_lock();
|
2007-10-19 13:40:16 +07:00
|
|
|
p = find_task_by_vpid(pid);
|
2007-10-19 13:40:14 +07:00
|
|
|
if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
|
2009-04-05 04:01:01 +07:00
|
|
|
error = check_kill_permission(sig, info, p);
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* The null signal is a permissions and process existence
|
|
|
|
* probe. No signal is actually delivered.
|
|
|
|
*/
|
2009-09-24 05:57:00 +07:00
|
|
|
if (!error && sig) {
|
|
|
|
error = do_send_sig_info(sig, info, p, false);
|
|
|
|
/*
|
|
|
|
* If lock_task_sighand() failed we pretend the task
|
|
|
|
* dies after receiving the signal. The window is tiny,
|
|
|
|
* and the signal is private anyway.
|
|
|
|
*/
|
|
|
|
if (unlikely(error == -ESRCH))
|
|
|
|
error = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
2008-04-30 14:52:51 +07:00
|
|
|
rcu_read_unlock();
|
2005-10-31 06:02:18 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2009-04-05 04:01:01 +07:00
|
|
|
static int do_tkill(pid_t tgid, pid_t pid, int sig)
|
|
|
|
{
|
2013-04-18 05:58:36 +07:00
|
|
|
struct siginfo info = {};
|
2009-04-05 04:01:01 +07:00
|
|
|
|
|
|
|
info.si_signo = sig;
|
|
|
|
info.si_errno = 0;
|
|
|
|
info.si_code = SI_TKILL;
|
|
|
|
info.si_pid = task_tgid_vnr(current);
|
2012-02-08 22:00:08 +07:00
|
|
|
info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
|
2009-04-05 04:01:01 +07:00
|
|
|
|
|
|
|
return do_send_specific(tgid, pid, sig, &info);
|
|
|
|
}
|
|
|
|
|
2005-10-31 06:02:18 +07:00
|
|
|
/**
|
|
|
|
* sys_tgkill - send signal to one specific thread
|
|
|
|
* @tgid: the thread group ID of the thread
|
|
|
|
* @pid: the PID of the thread
|
|
|
|
* @sig: signal to be sent
|
|
|
|
*
|
2007-02-10 16:45:59 +07:00
|
|
|
* This syscall also checks the @tgid and returns -ESRCH even if the PID
|
2005-10-31 06:02:18 +07:00
|
|
|
* exists but it's not belonging to the target process anymore. This
|
|
|
|
* method solves the problem of threads exiting and PIDs getting reused.
|
|
|
|
*/
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid_t, pid, int, sig)
|
2005-10-31 06:02:18 +07:00
|
|
|
{
|
|
|
|
/* This is only valid for single tasks */
|
|
|
|
if (pid <= 0 || tgid <= 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return do_tkill(tgid, pid, sig);
|
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_tkill - send signal to one specific task
|
|
|
|
* @pid: the PID of the task
|
|
|
|
* @sig: signal to be sent
|
|
|
|
*
|
2005-04-17 05:20:36 +07:00
|
|
|
* Send a signal to only one task, even if it's a CLONE_THREAD task.
|
|
|
|
*/
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE2(tkill, pid_t, pid, int, sig)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/* This is only valid for single tasks */
|
|
|
|
if (pid <= 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2005-10-31 06:02:18 +07:00
|
|
|
return do_tkill(0, pid, sig);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2012-12-26 03:19:12 +07:00
|
|
|
static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info)
|
|
|
|
{
|
|
|
|
/* Not even root can pretend to send signals from the kernel.
|
|
|
|
* Nor can they impersonate a kill()/tgkill(), which adds source info.
|
|
|
|
*/
|
2013-02-28 08:03:12 +07:00
|
|
|
if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
|
|
|
|
(task_pid_vnr(current) != pid)) {
|
2012-12-26 03:19:12 +07:00
|
|
|
/* We used to allow any < 0 si_code */
|
|
|
|
WARN_ON_ONCE(info->si_code < 0);
|
|
|
|
return -EPERM;
|
|
|
|
}
|
|
|
|
info->si_signo = sig;
|
|
|
|
|
|
|
|
/* POSIX.1b doesn't mention process groups. */
|
|
|
|
return kill_proc_info(sig, info, pid);
|
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigqueueinfo - send signal information to a signal
|
|
|
|
* @pid: the PID of the thread
|
|
|
|
* @sig: signal to be sent
|
|
|
|
* @uinfo: signal info to be sent
|
|
|
|
*/
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig,
|
|
|
|
siginfo_t __user *, uinfo)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
if (copy_from_user(&info, uinfo, sizeof(siginfo_t)))
|
|
|
|
return -EFAULT;
|
2012-12-26 03:19:12 +07:00
|
|
|
return do_rt_sigqueueinfo(pid, sig, &info);
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-12-26 03:19:12 +07:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo,
|
|
|
|
compat_pid_t, pid,
|
|
|
|
int, sig,
|
|
|
|
struct compat_siginfo __user *, uinfo)
|
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
int ret = copy_siginfo_from_user32(&info, uinfo);
|
|
|
|
if (unlikely(ret))
|
|
|
|
return ret;
|
|
|
|
return do_rt_sigqueueinfo(pid, sig, &info);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2012-12-26 03:19:12 +07:00
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-12-25 11:12:04 +07:00
|
|
|
static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
|
2009-04-05 04:01:06 +07:00
|
|
|
{
|
|
|
|
/* This is only valid for single tasks */
|
|
|
|
if (pid <= 0 || tgid <= 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Not even root can pretend to send signals from the kernel.
|
2011-03-19 05:05:21 +07:00
|
|
|
* Nor can they impersonate a kill()/tgkill(), which adds source info.
|
|
|
|
*/
|
2013-02-28 08:03:12 +07:00
|
|
|
if (((info->si_code >= 0 || info->si_code == SI_TKILL)) &&
|
|
|
|
(task_pid_vnr(current) != pid)) {
|
2011-03-19 05:05:21 +07:00
|
|
|
/* We used to allow any < 0 si_code */
|
|
|
|
WARN_ON_ONCE(info->si_code < 0);
|
2009-04-05 04:01:06 +07:00
|
|
|
return -EPERM;
|
2011-03-19 05:05:21 +07:00
|
|
|
}
|
2009-04-05 04:01:06 +07:00
|
|
|
info->si_signo = sig;
|
|
|
|
|
|
|
|
return do_send_specific(tgid, pid, sig, info);
|
|
|
|
}
|
|
|
|
|
|
|
|
SYSCALL_DEFINE4(rt_tgsigqueueinfo, pid_t, tgid, pid_t, pid, int, sig,
|
|
|
|
siginfo_t __user *, uinfo)
|
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
|
|
|
|
if (copy_from_user(&info, uinfo, sizeof(siginfo_t)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
|
|
|
|
}
|
|
|
|
|
2012-12-25 11:12:04 +07:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo,
|
|
|
|
compat_pid_t, tgid,
|
|
|
|
compat_pid_t, pid,
|
|
|
|
int, sig,
|
|
|
|
struct compat_siginfo __user *, uinfo)
|
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
|
|
|
|
if (copy_siginfo_from_user32(&info, uinfo))
|
|
|
|
return -EFAULT;
|
|
|
|
return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-03-29 07:11:24 +07:00
|
|
|
int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-04-30 14:52:39 +07:00
|
|
|
struct task_struct *t = current;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct k_sigaction *k;
|
2006-01-08 16:02:48 +07:00
|
|
|
sigset_t mask;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2005-05-01 22:59:14 +07:00
|
|
|
if (!valid_signal(sig) || sig < 1 || (act && sig_kernel_only(sig)))
|
2005-04-17 05:20:36 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-04-30 14:52:39 +07:00
|
|
|
k = &t->sighand->action[sig-1];
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
if (oact)
|
|
|
|
*oact = *k;
|
|
|
|
|
|
|
|
if (act) {
|
2006-02-10 02:41:50 +07:00
|
|
|
sigdelsetmask(&act->sa.sa_mask,
|
|
|
|
sigmask(SIGKILL) | sigmask(SIGSTOP));
|
2006-03-29 07:11:24 +07:00
|
|
|
*k = *act;
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* POSIX 3.3.1.3:
|
|
|
|
* "Setting a signal action to SIG_IGN for a signal that is
|
|
|
|
* pending shall cause the pending signal to be discarded,
|
|
|
|
* whether or not it is blocked."
|
|
|
|
*
|
|
|
|
* "Setting a signal action to SIG_DFL for a signal that is
|
|
|
|
* pending and whose default action is to ignore the signal
|
|
|
|
* (for example, SIGCHLD), shall cause the pending signal to
|
|
|
|
* be discarded, whether or not it is blocked"
|
|
|
|
*/
|
2008-07-26 09:45:51 +07:00
|
|
|
if (sig_handler_ignored(sig_handler(t, sig), sig)) {
|
2006-01-08 16:02:48 +07:00
|
|
|
sigemptyset(&mask);
|
|
|
|
sigaddset(&mask, sig);
|
|
|
|
rm_from_queue_full(&mask, &t->signal->shared_pending);
|
2005-04-17 05:20:36 +07:00
|
|
|
do {
|
2006-01-08 16:02:48 +07:00
|
|
|
rm_from_queue_full(&mask, &t->pending);
|
2014-01-24 06:55:56 +07:00
|
|
|
} while_each_thread(current, t);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-20 23:14:10 +07:00
|
|
|
static int
|
2005-04-17 05:20:36 +07:00
|
|
|
do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long sp)
|
|
|
|
{
|
|
|
|
stack_t oss;
|
|
|
|
int error;
|
|
|
|
|
2009-08-02 00:34:56 +07:00
|
|
|
oss.ss_sp = (void __user *) current->sas_ss_sp;
|
|
|
|
oss.ss_size = current->sas_ss_size;
|
|
|
|
oss.ss_flags = sas_ss_flags(sp);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (uss) {
|
|
|
|
void __user *ss_sp;
|
|
|
|
size_t ss_size;
|
|
|
|
int ss_flags;
|
|
|
|
|
|
|
|
error = -EFAULT;
|
2009-08-02 01:18:56 +07:00
|
|
|
if (!access_ok(VERIFY_READ, uss, sizeof(*uss)))
|
|
|
|
goto out;
|
|
|
|
error = __get_user(ss_sp, &uss->ss_sp) |
|
|
|
|
__get_user(ss_flags, &uss->ss_flags) |
|
|
|
|
__get_user(ss_size, &uss->ss_size);
|
|
|
|
if (error)
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
error = -EPERM;
|
|
|
|
if (on_sig_stack(sp))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
error = -EINVAL;
|
|
|
|
/*
|
2011-04-05 04:59:31 +07:00
|
|
|
* Note - this code used to test ss_flags incorrectly:
|
2005-04-17 05:20:36 +07:00
|
|
|
* old code may have been written using ss_flags==0
|
|
|
|
* to mean ss_flags==SS_ONSTACK (as this was the only
|
|
|
|
* way that worked) - this fix preserves that older
|
2011-04-05 04:59:31 +07:00
|
|
|
* mechanism.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
|
|
|
if (ss_flags != SS_DISABLE && ss_flags != SS_ONSTACK && ss_flags != 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (ss_flags == SS_DISABLE) {
|
|
|
|
ss_size = 0;
|
|
|
|
ss_sp = NULL;
|
|
|
|
} else {
|
|
|
|
error = -ENOMEM;
|
|
|
|
if (ss_size < MINSIGSTKSZ)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
current->sas_ss_sp = (unsigned long) ss_sp;
|
|
|
|
current->sas_ss_size = ss_size;
|
|
|
|
}
|
|
|
|
|
2009-08-02 00:34:56 +07:00
|
|
|
error = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
if (uoss) {
|
|
|
|
error = -EFAULT;
|
2009-08-02 00:34:56 +07:00
|
|
|
if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out;
|
2009-08-02 00:34:56 +07:00
|
|
|
error = __put_user(oss.ss_sp, &uoss->ss_sp) |
|
|
|
|
__put_user(oss.ss_size, &uoss->ss_size) |
|
|
|
|
__put_user(oss.ss_flags, &uoss->ss_flags);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
}
|
2012-12-15 02:09:47 +07:00
|
|
|
SYSCALL_DEFINE2(sigaltstack,const stack_t __user *,uss, stack_t __user *,uoss)
|
|
|
|
{
|
|
|
|
return do_sigaltstack(uss, uoss, current_user_stack_pointer());
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-11-19 03:29:16 +07:00
|
|
|
int restore_altstack(const stack_t __user *uss)
|
|
|
|
{
|
|
|
|
int err = do_sigaltstack(uss, NULL, current_user_stack_pointer());
|
|
|
|
/* squash all but EFAULT for now */
|
|
|
|
return err == -EFAULT ? err : 0;
|
|
|
|
}
|
|
|
|
|
2012-11-21 02:24:26 +07:00
|
|
|
int __save_altstack(stack_t __user *uss, unsigned long sp)
|
|
|
|
{
|
|
|
|
struct task_struct *t = current;
|
|
|
|
return __put_user((void __user *)t->sas_ss_sp, &uss->ss_sp) |
|
|
|
|
__put_user(sas_ss_flags(sp), &uss->ss_flags) |
|
|
|
|
__put_user(t->sas_ss_size, &uss->ss_size);
|
|
|
|
}
|
|
|
|
|
2012-12-15 02:47:53 +07:00
|
|
|
#ifdef CONFIG_COMPAT
|
2012-12-23 15:33:38 +07:00
|
|
|
COMPAT_SYSCALL_DEFINE2(sigaltstack,
|
|
|
|
const compat_stack_t __user *, uss_ptr,
|
|
|
|
compat_stack_t __user *, uoss_ptr)
|
2012-12-15 02:47:53 +07:00
|
|
|
{
|
|
|
|
stack_t uss, uoss;
|
|
|
|
int ret;
|
|
|
|
mm_segment_t seg;
|
|
|
|
|
|
|
|
if (uss_ptr) {
|
|
|
|
compat_stack_t uss32;
|
|
|
|
|
|
|
|
memset(&uss, 0, sizeof(stack_t));
|
|
|
|
if (copy_from_user(&uss32, uss_ptr, sizeof(compat_stack_t)))
|
|
|
|
return -EFAULT;
|
|
|
|
uss.ss_sp = compat_ptr(uss32.ss_sp);
|
|
|
|
uss.ss_flags = uss32.ss_flags;
|
|
|
|
uss.ss_size = uss32.ss_size;
|
|
|
|
}
|
|
|
|
seg = get_fs();
|
|
|
|
set_fs(KERNEL_DS);
|
|
|
|
ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
|
|
|
|
(stack_t __force __user *) &uoss,
|
|
|
|
compat_user_stack_pointer());
|
|
|
|
set_fs(seg);
|
|
|
|
if (ret >= 0 && uoss_ptr) {
|
|
|
|
if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(compat_stack_t)) ||
|
|
|
|
__put_user(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp) ||
|
|
|
|
__put_user(uoss.ss_flags, &uoss_ptr->ss_flags) ||
|
|
|
|
__put_user(uoss.ss_size, &uoss_ptr->ss_size))
|
|
|
|
ret = -EFAULT;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int compat_restore_altstack(const compat_stack_t __user *uss)
|
|
|
|
{
|
|
|
|
int err = compat_sys_sigaltstack(uss, NULL);
|
|
|
|
/* squash all but -EFAULT for now */
|
|
|
|
return err == -EFAULT ? err : 0;
|
|
|
|
}
|
2012-11-21 02:24:26 +07:00
|
|
|
|
|
|
|
int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp)
|
|
|
|
{
|
|
|
|
struct task_struct *t = current;
|
|
|
|
return __put_user(ptr_to_compat((void __user *)t->sas_ss_sp), &uss->ss_sp) |
|
|
|
|
__put_user(sas_ss_flags(sp), &uss->ss_flags) |
|
|
|
|
__put_user(t->sas_ss_size, &uss->ss_size);
|
|
|
|
}
|
2012-12-15 02:47:53 +07:00
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_SIGPENDING
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_sigpending - examine pending signals
|
|
|
|
* @set: where mask of pending signal is returned
|
|
|
|
*/
|
2009-01-14 20:14:06 +07:00
|
|
|
SYSCALL_DEFINE1(sigpending, old_sigset_t __user *, set)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-12-26 02:31:38 +07:00
|
|
|
return sys_rt_sigpending((sigset_t __user *)set, sizeof(old_sigset_t));
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_SIGPROCMASK
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_sigprocmask - examine and change blocked signals
|
|
|
|
* @how: whether to add, remove, or set signals
|
2011-04-28 16:36:20 +07:00
|
|
|
* @nset: signals to add or remove (if non-null)
|
2011-04-05 05:00:26 +07:00
|
|
|
* @oset: previous value of signal mask if non-null
|
|
|
|
*
|
2011-04-05 04:59:31 +07:00
|
|
|
* Some platforms have their own version with special arguments;
|
|
|
|
* others support only sys_rt_sigprocmask.
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 16:36:20 +07:00
|
|
|
SYSCALL_DEFINE3(sigprocmask, int, how, old_sigset_t __user *, nset,
|
2009-01-14 20:14:06 +07:00
|
|
|
old_sigset_t __user *, oset)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
old_sigset_t old_set, new_set;
|
2011-05-09 18:48:56 +07:00
|
|
|
sigset_t new_blocked;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 16:36:20 +07:00
|
|
|
old_set = current->blocked.sig[0];
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-28 16:36:20 +07:00
|
|
|
if (nset) {
|
|
|
|
if (copy_from_user(&new_set, nset, sizeof(*nset)))
|
|
|
|
return -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-05-09 18:48:56 +07:00
|
|
|
new_blocked = current->blocked;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
switch (how) {
|
|
|
|
case SIG_BLOCK:
|
2011-05-09 18:48:56 +07:00
|
|
|
sigaddsetmask(&new_blocked, new_set);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
case SIG_UNBLOCK:
|
2011-05-09 18:48:56 +07:00
|
|
|
sigdelsetmask(&new_blocked, new_set);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
case SIG_SETMASK:
|
2011-05-09 18:48:56 +07:00
|
|
|
new_blocked.sig[0] = new_set;
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
2011-05-09 18:48:56 +07:00
|
|
|
default:
|
|
|
|
return -EINVAL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-01-06 01:13:29 +07:00
|
|
|
set_current_blocked(&new_blocked);
|
2011-04-28 16:36:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (oset) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (copy_to_user(oset, &old_set, sizeof(*oset)))
|
2011-04-28 16:36:20 +07:00
|
|
|
return -EFAULT;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2011-04-28 16:36:20 +07:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
#endif /* __ARCH_WANT_SYS_SIGPROCMASK */
|
|
|
|
|
2012-11-26 11:12:10 +07:00
|
|
|
#ifndef CONFIG_ODD_RT_SIGACTION
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigaction - alter an action taken by a process
|
|
|
|
* @sig: signal to be sent
|
2011-04-09 00:53:46 +07:00
|
|
|
* @act: new sigaction
|
|
|
|
* @oact: used to save the previous sigaction
|
2011-04-05 05:00:26 +07:00
|
|
|
* @sigsetsize: size of sigset_t type
|
|
|
|
*/
|
2009-01-14 20:14:34 +07:00
|
|
|
SYSCALL_DEFINE4(rt_sigaction, int, sig,
|
|
|
|
const struct sigaction __user *, act,
|
|
|
|
struct sigaction __user *, oact,
|
|
|
|
size_t, sigsetsize)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct k_sigaction new_sa, old_sa;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (act) {
|
|
|
|
if (copy_from_user(&new_sa.sa, act, sizeof(new_sa.sa)))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_sa : NULL, oact ? &old_sa : NULL);
|
|
|
|
|
|
|
|
if (!ret && oact) {
|
|
|
|
if (copy_to_user(oact, &old_sa.sa, sizeof(old_sa.sa)))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
2012-12-26 06:38:15 +07:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE4(rt_sigaction, int, sig,
|
|
|
|
const struct compat_sigaction __user *, act,
|
|
|
|
struct compat_sigaction __user *, oact,
|
|
|
|
compat_size_t, sigsetsize)
|
|
|
|
{
|
|
|
|
struct k_sigaction new_ka, old_ka;
|
|
|
|
compat_sigset_t mask;
|
|
|
|
#ifdef __ARCH_HAS_SA_RESTORER
|
|
|
|
compat_uptr_t restorer;
|
|
|
|
#endif
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(compat_sigset_t))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (act) {
|
|
|
|
compat_uptr_t handler;
|
|
|
|
ret = get_user(handler, &act->sa_handler);
|
|
|
|
new_ka.sa.sa_handler = compat_ptr(handler);
|
|
|
|
#ifdef __ARCH_HAS_SA_RESTORER
|
|
|
|
ret |= get_user(restorer, &act->sa_restorer);
|
|
|
|
new_ka.sa.sa_restorer = compat_ptr(restorer);
|
|
|
|
#endif
|
|
|
|
ret |= copy_from_user(&mask, &act->sa_mask, sizeof(mask));
|
2013-09-12 04:23:18 +07:00
|
|
|
ret |= get_user(new_ka.sa.sa_flags, &act->sa_flags);
|
2012-12-26 06:38:15 +07:00
|
|
|
if (ret)
|
|
|
|
return -EFAULT;
|
|
|
|
sigset_from_compat(&new_ka.sa.sa_mask, &mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
|
|
|
|
if (!ret && oact) {
|
|
|
|
sigset_to_compat(&mask, &old_ka.sa.sa_mask);
|
|
|
|
ret = put_user(ptr_to_compat(old_ka.sa.sa_handler),
|
|
|
|
&oact->sa_handler);
|
|
|
|
ret |= copy_to_user(&oact->sa_mask, &mask, sizeof(mask));
|
2013-09-12 04:23:18 +07:00
|
|
|
ret |= put_user(old_ka.sa.sa_flags, &oact->sa_flags);
|
2012-12-26 06:38:15 +07:00
|
|
|
#ifdef __ARCH_HAS_SA_RESTORER
|
|
|
|
ret |= put_user(ptr_to_compat(old_ka.sa.sa_restorer),
|
|
|
|
&oact->sa_restorer);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
2012-11-26 11:12:10 +07:00
|
|
|
#endif /* !CONFIG_ODD_RT_SIGACTION */
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-12-26 07:09:45 +07:00
|
|
|
#ifdef CONFIG_OLD_SIGACTION
|
|
|
|
SYSCALL_DEFINE3(sigaction, int, sig,
|
|
|
|
const struct old_sigaction __user *, act,
|
|
|
|
struct old_sigaction __user *, oact)
|
|
|
|
{
|
|
|
|
struct k_sigaction new_ka, old_ka;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (act) {
|
|
|
|
old_sigset_t mask;
|
|
|
|
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) ||
|
|
|
|
__get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
|
|
|
|
__get_user(mask, &act->sa_mask))
|
|
|
|
return -EFAULT;
|
|
|
|
#ifdef __ARCH_HAS_KA_RESTORER
|
|
|
|
new_ka.ka_restorer = NULL;
|
|
|
|
#endif
|
|
|
|
siginitset(&new_ka.sa.sa_mask, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
|
|
|
|
|
|
|
|
if (!ret && 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) ||
|
|
|
|
__put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
|
|
|
|
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_COMPAT_OLD_SIGACTION
|
|
|
|
COMPAT_SYSCALL_DEFINE3(sigaction, int, sig,
|
|
|
|
const struct compat_old_sigaction __user *, act,
|
|
|
|
struct compat_old_sigaction __user *, oact)
|
|
|
|
{
|
|
|
|
struct k_sigaction new_ka, old_ka;
|
|
|
|
int ret;
|
|
|
|
compat_old_sigset_t mask;
|
|
|
|
compat_uptr_t handler, restorer;
|
|
|
|
|
|
|
|
if (act) {
|
|
|
|
if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
|
|
|
|
__get_user(handler, &act->sa_handler) ||
|
|
|
|
__get_user(restorer, &act->sa_restorer) ||
|
|
|
|
__get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
|
|
|
|
__get_user(mask, &act->sa_mask))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
#ifdef __ARCH_HAS_KA_RESTORER
|
|
|
|
new_ka.ka_restorer = NULL;
|
|
|
|
#endif
|
|
|
|
new_ka.sa.sa_handler = compat_ptr(handler);
|
|
|
|
new_ka.sa.sa_restorer = compat_ptr(restorer);
|
|
|
|
siginitset(&new_ka.sa.sa_mask, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
|
|
|
|
|
|
|
|
if (!ret && oact) {
|
|
|
|
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
|
|
|
|
__put_user(ptr_to_compat(old_ka.sa.sa_handler),
|
|
|
|
&oact->sa_handler) ||
|
|
|
|
__put_user(ptr_to_compat(old_ka.sa.sa_restorer),
|
|
|
|
&oact->sa_restorer) ||
|
|
|
|
__put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
|
|
|
|
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_SGETMASK
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For backwards compatibility. Functionality superseded by sigprocmask.
|
|
|
|
*/
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE0(sgetmask)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/* SMP safe */
|
|
|
|
return current->blocked.sig[0];
|
|
|
|
}
|
|
|
|
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE1(ssetmask, int, newmask)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-07-28 02:49:44 +07:00
|
|
|
int old = current->blocked.sig[0];
|
|
|
|
sigset_t newset;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-01-06 01:13:13 +07:00
|
|
|
siginitset(&newset, newmask);
|
2011-07-28 02:49:44 +07:00
|
|
|
set_current_blocked(&newset);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return old;
|
|
|
|
}
|
|
|
|
#endif /* __ARCH_WANT_SGETMASK */
|
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_SIGNAL
|
|
|
|
/*
|
|
|
|
* For backwards compatibility. Functionality superseded by sigaction.
|
|
|
|
*/
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct k_sigaction new_sa, old_sa;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
new_sa.sa.sa_handler = handler;
|
|
|
|
new_sa.sa.sa_flags = SA_ONESHOT | SA_NOMASK;
|
2006-02-10 02:41:41 +07:00
|
|
|
sigemptyset(&new_sa.sa.sa_mask);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
ret = do_sigaction(sig, &new_sa, &old_sa);
|
|
|
|
|
|
|
|
return ret ? ret : (unsigned long)old_sa.sa.sa_handler;
|
|
|
|
}
|
|
|
|
#endif /* __ARCH_WANT_SYS_SIGNAL */
|
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_PAUSE
|
|
|
|
|
2009-01-14 20:14:11 +07:00
|
|
|
SYSCALL_DEFINE0(pause)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-05-26 00:22:27 +07:00
|
|
|
while (!signal_pending(current)) {
|
|
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
|
|
schedule();
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
return -ERESTARTNOHAND;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2012-05-22 08:42:32 +07:00
|
|
|
int sigsuspend(sigset_t *set)
|
|
|
|
{
|
|
|
|
current->saved_sigmask = current->blocked;
|
|
|
|
set_current_blocked(set);
|
|
|
|
|
|
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
|
|
schedule();
|
|
|
|
set_restore_sigmask();
|
|
|
|
return -ERESTARTNOHAND;
|
|
|
|
}
|
|
|
|
|
2011-04-05 05:00:26 +07:00
|
|
|
/**
|
|
|
|
* sys_rt_sigsuspend - replace the signal mask for a value with the
|
|
|
|
* @unewset value until a signal is received
|
|
|
|
* @unewset: new signal mask value
|
|
|
|
* @sigsetsize: size of sigset_t type
|
|
|
|
*/
|
2009-01-14 20:14:34 +07:00
|
|
|
SYSCALL_DEFINE2(rt_sigsuspend, sigset_t __user *, unewset, size_t, sigsetsize)
|
2006-01-19 08:43:57 +07:00
|
|
|
{
|
|
|
|
sigset_t newset;
|
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (copy_from_user(&newset, unewset, sizeof(newset)))
|
|
|
|
return -EFAULT;
|
2012-05-22 08:42:32 +07:00
|
|
|
return sigsuspend(&newset);
|
2006-01-19 08:43:57 +07:00
|
|
|
}
|
2012-12-25 09:43:56 +07:00
|
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
COMPAT_SYSCALL_DEFINE2(rt_sigsuspend, compat_sigset_t __user *, unewset, compat_size_t, sigsetsize)
|
|
|
|
{
|
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
sigset_t newset;
|
|
|
|
compat_sigset_t newset32;
|
|
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (copy_from_user(&newset32, unewset, sizeof(compat_sigset_t)))
|
|
|
|
return -EFAULT;
|
|
|
|
sigset_from_compat(&newset, &newset32);
|
|
|
|
return sigsuspend(&newset);
|
|
|
|
#else
|
|
|
|
/* on little-endian bitmaps don't care about granularity */
|
|
|
|
return sys_rt_sigsuspend((sigset_t __user *)unewset, sigsetsize);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
2006-01-19 08:43:57 +07:00
|
|
|
|
2012-12-26 04:04:12 +07:00
|
|
|
#ifdef CONFIG_OLD_SIGSUSPEND
|
|
|
|
SYSCALL_DEFINE1(sigsuspend, old_sigset_t, mask)
|
|
|
|
{
|
|
|
|
sigset_t blocked;
|
|
|
|
siginitset(&blocked, mask);
|
|
|
|
return sigsuspend(&blocked);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_OLD_SIGSUSPEND3
|
|
|
|
SYSCALL_DEFINE3(sigsuspend, int, unused1, int, unused2, old_sigset_t, mask)
|
|
|
|
{
|
|
|
|
sigset_t blocked;
|
|
|
|
siginitset(&blocked, mask);
|
|
|
|
return sigsuspend(&blocked);
|
|
|
|
}
|
|
|
|
#endif
|
2006-01-19 08:43:57 +07:00
|
|
|
|
2014-04-08 05:39:20 +07:00
|
|
|
__weak const char *arch_vma_name(struct vm_area_struct *vma)
|
2006-09-27 15:50:23 +07:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
void __init signals_init(void)
|
|
|
|
{
|
2007-05-07 04:49:57 +07:00
|
|
|
sigqueue_cachep = KMEM_CACHE(sigqueue, SLAB_PANIC);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-05-21 09:04:21 +07:00
|
|
|
|
|
|
|
#ifdef CONFIG_KGDB_KDB
|
|
|
|
#include <linux/kdb.h>
|
|
|
|
/*
|
|
|
|
* kdb_send_sig_info - Allows kdb to send signals without exposing
|
|
|
|
* signal internals. This function checks if the required locks are
|
|
|
|
* available before calling the main signal code, to avoid kdb
|
|
|
|
* deadlocks.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
kdb_send_sig_info(struct task_struct *t, struct siginfo *info)
|
|
|
|
{
|
|
|
|
static struct task_struct *kdb_prev_t;
|
|
|
|
int sig, new_t;
|
|
|
|
if (!spin_trylock(&t->sighand->siglock)) {
|
|
|
|
kdb_printf("Can't do kill command now.\n"
|
|
|
|
"The sigmask lock is held somewhere else in "
|
|
|
|
"kernel, try again later\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
spin_unlock(&t->sighand->siglock);
|
|
|
|
new_t = kdb_prev_t != t;
|
|
|
|
kdb_prev_t = t;
|
|
|
|
if (t->state != TASK_RUNNING && new_t) {
|
|
|
|
kdb_printf("Process is not RUNNING, sending a signal from "
|
|
|
|
"kdb risks deadlock\n"
|
|
|
|
"on the run queue locks. "
|
|
|
|
"The signal has _not_ been sent.\n"
|
|
|
|
"Reissue the kill command if you want to risk "
|
|
|
|
"the deadlock.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sig = info->si_signo;
|
|
|
|
if (send_sig_info(sig, info, t))
|
|
|
|
kdb_printf("Fail to deliver Signal %d to process %d.\n",
|
|
|
|
sig, t->pid);
|
|
|
|
else
|
|
|
|
kdb_printf("Signal %d is sent to process %d.\n", sig, t->pid);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_KGDB_KDB */
|