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

Commit 6dd69f10 authored by Vadim Lobanov's avatar Vadim Lobanov Committed by Linus Torvalds
Browse files

[PATCH] Unify sys_tkill() and sys_tgkill() 



The majority of the sys_tkill() and sys_tgkill() function code is
duplicated between the two of them.  This patch pulls the duplication out
into a separate function -- do_tkill() -- and lets sys_tkill() and
sys_tgkill() be simple wrappers around it.  This should make it easier to
maintain in light of future changes.

Signed-off-by: default avatarVadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 19a4fcb5

kernel/signal.c

+25 −46
Original line number Diff line number Diff line
@@ -2283,26 +2283,13 @@ sys_kill(int pid, int sig) 
	return kill_something_info(sig, &info, pid);

}



/**

 *  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

 *

 *  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)

static int do_tkill(int tgid, int pid, int sig)

{

	struct siginfo info;

	int error;

	struct siginfo info;

	struct task_struct *p;



	/* This is only valid for single tasks */

	if (pid <= 0 || tgid <= 0)

		return -EINVAL;



	error = -ESRCH;

	info.si_signo = sig;

	info.si_errno = 0;

	info.si_code = SI_TKILL;
@@ -2311,8 +2298,7 @@ asmlinkage long sys_tgkill(int tgid, int pid, int sig) 


	read_lock(&tasklist_lock);

	p = find_task_by_pid(pid);

	error = -ESRCH;

	if (p && (p->tgid == tgid)) {

	if (p && (tgid <= 0 || p->tgid == tgid)) {

		error = check_kill_permission(sig, &info, p);

		/*

		 * The null signal is a permissions and process existence
@@ -2326,47 +2312,40 @@ asmlinkage long sys_tgkill(int tgid, int pid, int sig) 
		}

	}

	read_unlock(&tasklist_lock);



	return error;

}



/**

 *  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

 *

 *  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)

{

	/* This is only valid for single tasks */

	if (pid <= 0 || tgid <= 0)

		return -EINVAL;



	return do_tkill(tgid, pid, sig);

}



/*

 *  Send a signal to only one task, even if it's a CLONE_THREAD task.

 */

asmlinkage long

sys_tkill(int pid, int sig)

{

	struct siginfo info;

	int error;

	struct task_struct *p;



	/* This is only valid for single tasks */

	if (pid <= 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;

	if (p) {

		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;

	return do_tkill(0, pid, sig);

}



asmlinkage long