svn commit: r229936 - head/lib/libutil

[Pawel Jakub Dawidek]

On Tue, Jan 10, 2012 at 06:43:27PM +0000, Guy Helmer wrote:
> Author: ghelmer
> Date: Tue Jan 10 18:43:27 2012
> New Revision: 229936
> URL: http://svn.freebsd.org/changeset/base/229936
> 
> Log:
>   Set the FD_CLOEXEC flag on the open pidfile file descriptor.
>   
>   Discussed with: pjd, des

Could you also update manual page to note that pidfile_open(3) can now
also set errno via fcntl(2)?

> Modified:
>   head/lib/libutil/pidfile.c
> 
> Modified: head/lib/libutil/pidfile.c
> ==============================================================================
> --- head/lib/libutil/pidfile.c	Tue Jan 10 18:20:19 2012	(r229935)
> +++ head/lib/libutil/pidfile.c	Tue Jan 10 18:43:27 2012	(r229936)
> @@ -137,6 +137,20 @@ pidfile_open(const char *path, mode_t mo
>  		free(pfh);
>  		return (NULL);
>  	}
> +
> +	/*
> +	 * Prevent the file descriptor from escaping to other
> +	 * programs via exec(3).
> +	 */
> +	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
> +		error = errno;
> +		unlink(pfh->pf_path);
> +		close(fd);
> +		free(pfh);
> +		errno = error;
> +		return (NULL);
> +	}
> +
>  	/*
>  	 * Remember file information, so in pidfile_write() we are sure we write
>  	 * to the proper descriptor.

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://yomoli.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20120110/ef2341cf/attachment.pgp