--- linux-2.5/arch/i386/kernel/entry.S-old 2003-06-24 09:40:12.000000000 -0700 +++ linux-2.5/arch/i386/kernel/entry.S 2003-07-07 12:36:55.000000000 -0700 @@ -876,5 +876,6 @@ ENTRY(sys_call_table) .long sys_clock_nanosleep .long sys_statfs64 .long sys_fstatfs64 + .long sys_tgkill nr_syscalls=(.-sys_call_table)/4 --- linux-2.5/include/asm-i386/unistd.h-old 2003-06-24 09:40:13.000000000 -0700 +++ linux-2.5/include/asm-i386/unistd.h 2003-07-07 12:32:37.000000000 -0700 @@ -275,8 +275,9 @@ #define __NR_clock_nanosleep (__NR_timer_create+8) #define __NR_statfs64 268 #define __NR_fstatfs64 269 +#define __NR_tgkill 270 -#define NR_syscalls 270 +#define NR_syscalls 271 /* user-visible error numbers are in the range -1 - -124: see */ --- linux-2.5/kernel/signal.c-old 2003-07-05 12:08:48.000000000 -0700 +++ linux-2.5/kernel/signal.c 2003-07-07 13:03:15.000000000 -0700 @@ -579,8 +579,8 @@ static int rm_from_queue(unsigned long m /* * Bad permissions for sending the signal */ -static inline int check_kill_permission(int sig, struct siginfo *info, - struct task_struct *t) +static int check_kill_permission(int sig, struct siginfo *info, + struct task_struct *t) { int error = -EINVAL; if (sig < 0 || sig > _NSIG) @@ -2088,6 +2088,57 @@ sys_kill(int pid, int sig) return kill_something_info(sig, &info, pid); } +/** + * sys_tkill - 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 + * + * This syscall also checks the tgid and returns -ESRCH even if the PID + * exists but it's not belonging to the target process anymore. This + * method solves the problem of threads exiting and PIDs getting reused. + */ +asmlinkage long sys_tgkill(int tgid, int pid, int sig) +{ + struct siginfo info; + int error; + struct task_struct *p; + + /* Handle tgkill(tgid, -1, sig) like kill(tgid, sig). */ + if (pid == -1) + return sys_kill(tgid, sig); + + /* This is only valid for single tasks */ + if (pid <= 0 || tgid < -1 || tgid == 0) + return -EINVAL; + + info.si_signo = sig; + info.si_errno = 0; + info.si_code = SI_TKILL; + info.si_pid = current->tgid; + info.si_uid = current->uid; + + read_lock(&tasklist_lock); + p = find_task_by_pid(pid); + error = -ESRCH; + /* Handle tgkill(-1, pid, sig) like tkill(pid, sig). */ + if (p && (p->tgid == tgid || tgid == -1)) { + error = check_kill_permission(sig, &info, p); + /* + * The null signal is a permissions and process existence + * probe. No signal is actually delivered. + */ + if (!error && sig && p->sighand) { + spin_lock_irq(&p->sighand->siglock); + handle_stop_signal(sig, p); + error = specific_send_sig_info(sig, &info, p); + spin_unlock_irq(&p->sighand->siglock); + } + } + read_unlock(&tasklist_lock); + return error; +} + /* * Send a signal to only one task, even if it's a CLONE_THREAD task. */