From owner-freebsd-bugs@FreeBSD.ORG Wed Mar 2 18:37:47 2005 Return-Path: Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EC1E16A4CE; Wed, 2 Mar 2005 18:37:47 +0000 (GMT) Received: from mail-gw0.york.ac.uk (mail-gw0.york.ac.uk [144.32.128.245]) by mx1.FreeBSD.org (Postfix) with ESMTP id A69B243D3F; Wed, 2 Mar 2005 18:37:46 +0000 (GMT) (envelope-from gavin.atkinson@ury.york.ac.uk) Received: from ury.york.ac.uk (ury.york.ac.uk [144.32.108.81]) by mail-gw0.york.ac.uk (8.12.10/8.12.10) with ESMTP id j22IbiYX025420; Wed, 2 Mar 2005 18:37:44 GMT Received: from ury.york.ac.uk (localhost.york.ac.uk [127.0.0.1]) by ury.york.ac.uk (8.12.9p2/8.12.9) with ESMTP id j22Ibip8085726; Wed, 2 Mar 2005 18:37:44 GMT (envelope-from gavin.atkinson@ury.york.ac.uk) Received: from localhost (gavin@localhost)j22Ibif1085723; Wed, 2 Mar 2005 18:37:44 GMT (envelope-from gavin.atkinson@ury.york.ac.uk) X-Authentication-Warning: ury.york.ac.uk: gavin owned process doing -bs Date: Wed, 2 Mar 2005 18:37:44 +0000 (GMT) From: Gavin Atkinson X-X-Sender: gavin@ury.york.ac.uk To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-bugs@FreeBSD.org In-Reply-To: <200503021520.j22FKDiS080979@freefall.freebsd.org> Message-ID: <20050302183348.L85538@ury.york.ac.uk> References: <200503021520.j22FKDiS080979@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-York-MailScanner: Found to be clean X-York-MailScanner-From: 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 List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2005 18:37:47 -0000 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 ---