From owner-svn-src-all@FreeBSD.ORG  Mon Mar  1 14:27:17 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 078171065677;
	Mon,  1 Mar 2010 14:27:17 +0000 (UTC)
	(envelope-from bruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D1AD88FC14;
	Mon,  1 Mar 2010 14:27:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21ERGdX024390;
	Mon, 1 Mar 2010 14:27:16 GMT (envelope-from bruno@svn.freebsd.org)
Received: (from bruno@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21ERGkq024388;
	Mon, 1 Mar 2010 14:27:16 GMT (envelope-from bruno@svn.freebsd.org)
Message-Id: <201003011427.o21ERGkq024388@svn.freebsd.org>
From: Bruno Ducrot <bruno@FreeBSD.org>
Date: Mon, 1 Mar 2010 14:27:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204519 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 14:27:17 -0000

Author: bruno
Date: Mon Mar  1 14:27:16 2010
New Revision: 204519
URL: http://svn.freebsd.org/changeset/base/204519

Log:
  Deliver siginfo when signal is generated by thr_kill(2) (SI_USER with properly
  filled si_uid and si_pid).
  
  Reported by:	Joel Bertrand <joel.bertrand systella fr>
  PR:		141956
  Reviewed by:	kib
  MFC after:	2 weeks

Modified:
  head/sys/kern/kern_thr.c

Modified: head/sys/kern/kern_thr.c
==============================================================================
--- head/sys/kern/kern_thr.c	Mon Mar  1 13:56:15 2010	(r204518)
+++ head/sys/kern/kern_thr.c	Mon Mar  1 14:27:16 2010	(r204519)
@@ -303,12 +303,18 @@ int
 thr_kill(struct thread *td, struct thr_kill_args *uap)
     /* long id, int sig */
 {
+	ksiginfo_t ksi;
 	struct thread *ttd;
 	struct proc *p;
 	int error;
 
 	p = td->td_proc;
 	error = 0;
+	ksiginfo_init(&ksi);
+	ksi.ksi_signo = uap->sig;
+	ksi.ksi_code = SI_USER;
+	ksi.ksi_pid = p->p_pid;
+	ksi.ksi_uid = td->td_ucred->cr_ruid;
 	PROC_LOCK(p);
 	if (uap->id == -1) {
 		if (uap->sig != 0 && !_SIG_VALID(uap->sig)) {
@@ -320,7 +326,7 @@ thr_kill(struct thread *td, struct thr_k
 					error = 0;
 					if (uap->sig == 0)
 						break;
-					tdsignal(p, ttd, uap->sig, NULL);
+					tdsignal(p, ttd, uap->sig, &ksi);
 				}
 			}
 		}
@@ -336,7 +342,7 @@ thr_kill(struct thread *td, struct thr_k
 		else if (!_SIG_VALID(uap->sig))
 			error = EINVAL;
 		else
-			tdsignal(p, ttd, uap->sig, NULL);
+			tdsignal(p, ttd, uap->sig, &ksi);
 	}
 	PROC_UNLOCK(p);
 	return (error);
@@ -346,6 +352,7 @@ int
 thr_kill2(struct thread *td, struct thr_kill2_args *uap)
     /* pid_t pid, long id, int sig */
 {
+	ksiginfo_t ksi;
 	struct thread *ttd;
 	struct proc *p;
 	int error;
@@ -362,6 +369,11 @@ thr_kill2(struct thread *td, struct thr_
 
 	error = p_cansignal(td, p, uap->sig);
 	if (error == 0) {
+		ksiginfo_init(&ksi);
+		ksi.ksi_signo = uap->sig;
+		ksi.ksi_code = SI_USER;
+		ksi.ksi_pid = td->td_proc->p_pid;
+		ksi.ksi_uid = td->td_ucred->cr_ruid;
 		if (uap->id == -1) {
 			if (uap->sig != 0 && !_SIG_VALID(uap->sig)) {
 				error = EINVAL;
@@ -372,7 +384,8 @@ thr_kill2(struct thread *td, struct thr_
 						error = 0;
 						if (uap->sig == 0)
 							break;
-						tdsignal(p, ttd, uap->sig, NULL);
+						tdsignal(p, ttd, uap->sig,
+						    &ksi);
 					}
 				}
 			}
@@ -388,7 +401,7 @@ thr_kill2(struct thread *td, struct thr_
 			else if (!_SIG_VALID(uap->sig))
 				error = EINVAL;
 			else
-				tdsignal(p, ttd, uap->sig, NULL);
+				tdsignal(p, ttd, uap->sig, &ksi);
 		}
 	}
 	PROC_UNLOCK(p);