From zak@purge.bash.sh  Fri Feb 14 11:27:14 2003
Return-Path: <zak@purge.bash.sh>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 57E1537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Feb 2003 11:27:14 -0800 (PST)
Received: from purge.bash.sh (purge.bash.sh [62.253.236.247])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA6D643F75
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Feb 2003 11:27:13 -0800 (PST)
	(envelope-from zak@purge.bash.sh)
Received: from zak by purge.bash.sh with local (Exim 3.36 #1 (Debian))
	id 18jlUO-0001t1-00
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Feb 2003 19:27:12 +0000
Message-Id: <20030214192712.GA7047@purge.bash.sh>
Date: Fri, 14 Feb 2003 19:27:12 +0000
From: stacey_ <duqz@starwhack.net>
Reply-To: stacey <duqz@starwhack.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] killall(1) suicides before killing matching processes
X-Send-Pr-Version: 3.113

>Number:         48285
>Category:       bin
>Synopsis:       [PATCH] killall(1) suicides before killing matching processes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 14 11:30:03 PST 2003
>Closed-Date:    Fri Feb 14 11:33:35 PST 2003
>Last-Modified:  Fri Feb 14 11:33:35 PST 2003
>Originator:     stacey
>Release:        FreeBSD 5.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD heaven 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Tue Feb 4 23:56:36 GMT 2003 root@heaven:/usr/obj/usr/src/sys/HEAVEN i386


>Description:
	killall(1) suicides

>How-To-Repeat:
	$ ps | grep killall
	90795  p1  T      0:00.12 killall ducks
	90797  p1  T      0:00.05 killall go
	90800  p1  T      0:00.05 killall wak wak
	90809  p1  R+     0:00.06 grep killall

	$ killall -KILL -v killall
	kill -KILL 90810
	Killed

>Fix:
	
--- killall.c	Wed Feb  5 14:20:27 2003
+++ killall.c	Sun Feb  9 20:47:37 2003
@@ -114,6 +114,7 @@
 	int		zflag = 0;
 	uid_t		uid = 0;
 	dev_t		tdev = 0;
+	pid_t		mypid;
 	char		thiscmd[MAXCOMLEN + 1];
 	pid_t		thispid;
 	uid_t		thisuid;
@@ -285,6 +286,7 @@
 	nprocs = size / sizeof(struct kinfo_proc);
 	if (dflag)
 		printf("nprocs %d\n", nprocs);
+	mypid = getpid();
 
 	for (i = 0; i < nprocs; i++) {
 		if ((procs[i].ki_stat & SZOMB) == SZOMB && !zflag)
@@ -295,6 +297,8 @@
 		thistdev = procs[i].ki_tdev;
 		thisuid = procs[i].ki_ruid;	/* real uid */
 
+		if (thispid == mypid)
+			continue;
 		matched = 1;
 		if (user) {
 			if (thisuid != uid)

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: maxim 
State-Changed-When: Fri Feb 14 11:33:08 PST 2003 
State-Changed-Why:  
Duplicate of bin/46107. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48285 
>Unformatted:
