From darius@chowder.dons.net.au  Thu Feb 21 05:02:41 2002
Return-Path: <darius@chowder.dons.net.au>
Received: from chowder.dons.net.au (chowder.dons.net.au [203.31.81.11])
	by hub.freebsd.org (Postfix) with ESMTP id 2E54B37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Feb 2002 05:02:39 -0800 (PST)
Received: (from darius@localhost)
	by chowder.dons.net.au (8.11.6/8.11.6) id g1LD2VH01615;
	Thu, 21 Feb 2002 23:32:31 +1030 (CST)
	(envelope-from darius)
Message-Id: <200202211302.g1LD2VH01615@chowder.dons.net.au>
Date: Thu, 21 Feb 2002 23:32:31 +1030 (CST)
From: "Daniel O'Connor" <darius@dons.net.au>
Reply-To: "Daniel O'Connor" <darius@dons.net.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: APMD does not set close on exec for /dev/apm*
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         35182
>Category:       i386
>Synopsis:       APMD does not set close on exec for /dev/apm*
>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:   Thu Feb 21 05:10:00 PST 2002
>Closed-Date:    Sat Jun 21 22:57:55 PDT 2003
>Last-Modified:  Sat Jun 21 22:57:55 PDT 2003
>Originator:     Daniel O'Connor
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD chowder.dons.net.au 4.5-STABLE FreeBSD 4.5-STABLE #4: Mon Feb 11 13:52:27 CST 2002 darius@chowder.gsoft.com.au:/usr/obj/usr/src/sys/CHOWDER i386


>Description:
apmd does not set close-on-exec for its APM device file descriptors which
leads to problems trying to get the child processes to exit etc..

>How-To-Repeat:
Run something from apmd. Observe the child process hold an fd to APM device
nodes

>Fix:

Index: apmd.c
===================================================================
RCS file: /usr/CVS-Repository/src/usr.sbin/apmd/apmd.c,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 apmd.c
--- apmd.c	13 Aug 2001 17:30:30 -0000	1.3.2.1
+++ apmd.c	21 Feb 2002 12:58:04 -0000
@@ -683,8 +683,16 @@
 		(void) err(1, "cannot open device file `%s'", APM_NORM_DEVICEFILE);
 	}
 
+	if (fcntl(apmnorm_fd, F_SETFD, 1) == -1) {
+		(void) err(1, "cannot set close-on-exec flag for device file '%s'", APM_NORM_DEVICEFILE);
+	}
+
 	if ((apmctl_fd = open(APM_CTL_DEVICEFILE, O_RDWR)) == -1) {
 		(void) err(1, "cannot open device file `%s'", APM_CTL_DEVICEFILE);
+	}
+
+	if (fcntl(apmctl_fd, F_SETFD, 1) == -1) {
+		(void) err(1, "cannot set close-on-exec flag for device file '%s'", APM_CTL_DEVICEFILE);
 	}
 
 	restart();

>Release-Note:
>Audit-Trail:

From: "Daniel O'Connor" <darius@dons.net.au>
To: freebsd-gnats-submit@FreeBSD.org, darius@dons.net.au
Cc:  
Subject: Re: i386/35182: APMD does not set close on exec for /dev/apm*
Date: Sat, 23 Feb 2002 00:21:49 +1030

 Also needs..
 Index: apmd.c
 ===================================================================
 RCS file: /usr/CVS-Repository/src/usr.sbin/apmd/apmd.c,v
 retrieving revision 1.3.2.1
 diff -u -r1.3.2.1 apmd.c
 --- apmd.c      13 Aug 2001 17:30:30 -0000      1.3.2.1
 +++ apmd.c      22 Feb 2002 13:43:37 -0000
 @@ -119,6 +119,9 @@
                  goto out;
          case 0:
                  /* child process */
 +               signal(SIGHUP, SIG_DFL);
 +               signal(SIGCHLD, SIG_DFL);
 +               signal(SIGTERM, SIG_DFL);
                  execl(_PATH_BSHELL, "sh", "-c", p->line, (char *)NULL);
                  _exit(127);
          default:
 
 To allow children to be signalled as they expect.
 
 ---
 Daniel O'Connor software and network engineer
 for Genesis Software - http://www.gsoft.com.au
 "The nice thing about standards is that there
 are so many of them to choose from."
    -- Andrew Tanenbaum
 
State-Changed-From-To: open->closed 
State-Changed-By: mdodd 
State-Changed-When: Sat Jun 21 22:57:38 PDT 2003 
State-Changed-Why:  
Committed in -current 

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