Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Jan 2012 22:27:11 +0100
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        Guy Helmer <ghelmer@FreeBSD.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org
Subject:   Re: svn commit: r229936 - head/lib/libutil
Message-ID:  <20120110212710.GB1694@garage.freebsd.pl>
In-Reply-To: <20120110212525.GA1694@garage.freebsd.pl>
References:  <201201101843.q0AIhRuM022949@svn.freebsd.org> <20120110212525.GA1694@garage.freebsd.pl>

next in thread | previous in thread | raw e-mail | index | archive | help

--eJnRUKwClWJh1Khz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 10, 2012 at 10:25:26PM +0100, Pawel Jakub Dawidek wrote:
> 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
> >=20
> > Log:
> >   Set the FD_CLOEXEC flag on the open pidfile file descriptor.
> >  =20
> >   Discussed with: pjd, des
>=20
> Could you also update manual page to note that pidfile_open(3) can now
> also set errno via fcntl(2)?

Actually, it would also be useful to document the fact that we now set
FD_CLOEXEC flag, so one doesn't have to look at the code to find it.

> > Modified:
> >   head/lib/libutil/pidfile.c
> >=20
> > Modified: head/lib/libutil/pidfile.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- 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) =3D=3D -1) {
> > +		error =3D errno;
> > +		unlink(pfh->pf_path);
> > +		close(fd);
> > +		free(pfh);
> > +		errno =3D error;
> > +		return (NULL);
> > +	}
> > +
> >  	/*
> >  	 * Remember file information, so in pidfile_write() we are sure we wr=
ite
> >  	 * to the proper descriptor.

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://yomoli.com

--eJnRUKwClWJh1Khz
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)

iEYEARECAAYFAk8MrS0ACgkQForvXbEpPzQxogCfa/9gbXsgdYUPnmaUlYiAnA92
B58An3t1bIujsh51y1Xber8lyCy7NikY
=9emm
-----END PGP SIGNATURE-----

--eJnRUKwClWJh1Khz--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120110212710.GB1694>