From owner-freebsd-bugs@FreeBSD.ORG  Wed Mar  2 18:40:04 2005
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A7CA416A4D6
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  2 Mar 2005 18:40:04 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6828D43D3F
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  2 Mar 2005 18:40:04 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j22Ie4wM004664
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 2 Mar 2005 18:40:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j22Ie45d004663;
	Wed, 2 Mar 2005 18:40:04 GMT
	(envelope-from gnats)
Date: Wed, 2 Mar 2005 18:40:04 GMT
Message-Id: <200503021840.j22Ie45d004663@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
Subject: Re: bin/78304: Signal handler abuse in comsat(8)
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Mar 2005 18:40:04 -0000

The following reply was made to PR bin/78304; it has been noted by GNATS.

From: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-bugs@FreeBSD.org
Cc:  
Subject: Re: bin/78304: Signal handler abuse in comsat(8)
Date: Wed, 2 Mar 2005 18:37:44 +0000 (GMT)

 Sorry, attached an earlier version of the patch by mistake.
 
 Copy of it at http://www.devrandom.co.uk/freebsd/comsat-sigs.patch incase
 my mail reader has mangled this copy.
 
 Gavin
 
 --- comsat-sigs.patch begins here ---
 Index: src/libexec/comsat/comsat.c
 ===================================================================
 RCS file: /usr/cvs/src/libexec/comsat/comsat.c,v
 retrieving revision 1.17
 diff -u -r1.17 comsat.c
 --- src/libexec/comsat/comsat.c	14 Feb 2005 17:42:56 -0000	1.17
 +++ src/libexec/comsat/comsat.c	28 Feb 2005 00:07:10 -0000
 @@ -77,11 +77,13 @@
  struct	utmp *utmp = NULL;
  time_t	lastmsgtime;
  int	nutmp, uf;
 +volatile sig_atomic_t needreadutmp = 0;
 
  void jkfprintf(FILE *, char[], char[], off_t);
  void mailfor(char *);
  void notify(struct utmp *, char[], off_t, int);
  void onalrm(int);
 +void readutmp(void);
  void reapchildren(int);
 
  int
 @@ -109,11 +111,16 @@
  	}
  	(void)time(&lastmsgtime);
  	(void)gethostname(hostname, sizeof(hostname));
 -	onalrm(0);
 +	readutmp();
  	(void)signal(SIGALRM, onalrm);
  	(void)signal(SIGTTOU, SIG_IGN);
  	(void)signal(SIGCHLD, reapchildren);
  	for (;;) {
 +		if (needreadutmp) {
 +			needreadutmp = 0;
 +			readutmp();
 +		}
 +
  		cc = recv(0, msgbuf, sizeof(msgbuf) - 1, 0);
  		if (cc <= 0) {
  			if (errno != EINTR)
 @@ -134,12 +141,22 @@
  void
  reapchildren(int signo)
  {
 -	while (wait3(NULL, WNOHANG, NULL) > 0);
 +	int save_errno = errno;
 +
 +	while (wait3(NULL, WNOHANG, NULL) > 0)
 +		;
 +	errno = save_errno;
  }
 
  void
  onalrm(int signo)
  {
 +	needreadutmp = 1;
 +}
 +
 +void
 +readutmp(void)
 +{
  	static u_int utmpsize;		/* last malloced size for utmp */
  	static u_int utmpmtime;		/* last modification time for utmp */
  	struct stat statbf;
 --- comsat-sigs.patch ends here ---