From owner-svn-src-all@FreeBSD.ORG Sat Dec 1 03:02:58 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 40C2E7AB; Sat, 1 Dec 2012 03:02:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id D1DE08FC08; Sat, 1 Dec 2012 03:02:57 +0000 (UTC) Received: from tom.home (localhost [127.0.0.1]) by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qB132kB2091040; Sat, 1 Dec 2012 05:02:46 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.7.1 kib.kiev.ua qB132kB2091040 Received: (from kostik@localhost) by tom.home (8.14.5/8.14.5/Submit) id qB132kwD091039; Sat, 1 Dec 2012 05:02:46 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 1 Dec 2012 05:02:46 +0200 From: Konstantin Belousov To: Pawel Jakub Dawidek Subject: Re: svn commit: r243726 - in head/sys: kern security/audit Message-ID: <20121201030246.GB3013@kib.kiev.ua> References: <201211302318.qAUNInIh074238@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4zKt6bo/V7G+vDr7" Content-Disposition: inline In-Reply-To: <201211302318.qAUNInIh074238@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 03:02:58 -0000 --4zKt6bo/V7G+vDr7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 30, 2012 at 11:18:49PM +0000, Pawel Jakub Dawidek wrote: > Modified: head/sys/security/audit/audit_bsm_klib.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/sys/security/audit/audit_bsm_klib.c Fri Nov 30 23:13:56 2012 (r2= 43725) > +++ head/sys/security/audit/audit_bsm_klib.c Fri Nov 30 23:18:49 2012 (r2= 43726) > @@ -462,13 +462,13 @@ auditon_command_event(int cmd) > * leave the filename starting with '/' in the audit log in this case. > */ > void > -audit_canon_path(struct thread *td, char *path, char *cpath) > +audit_canon_path(struct thread *td, int dirfd, char *path, char *cpath) > { > struct vnode *cvnp, *rvnp; > char *rbuf, *fbuf, *copy; > struct filedesc *fdp; > struct sbuf sbf; > - int error, cwir; > + int error, needslash, vfslocked; > =20 > WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: at %s:%d", > __func__, __FILE__, __LINE__); > @@ -491,10 +491,27 @@ audit_canon_path(struct thread *td, char > * path. > */ > if (*path !=3D '/') { > - cvnp =3D fdp->fd_cdir; > - vhold(cvnp); > + if (dirfd =3D=3D AT_FDCWD) { > + cvnp =3D fdp->fd_cdir; > + vhold(cvnp); > + } else { > + /* XXX: fgetvp() that vhold()s vnode instead of vref()ing it would be= better */ This line is too long. > + error =3D fgetvp(td, dirfd, 0, &cvnp); > + if (error) { > + cpath[0] =3D '\0'; > + if (rvnp !=3D NULL) > + vdrop(rvnp); > + return; > + } > + vhold(cvnp); > + vfslocked =3D VFS_LOCK_GIANT(cvnp->v_mount); > + vrele(cvnp); > + VFS_UNLOCK_GIANT(vfslocked); And this cannot compile. --4zKt6bo/V7G+vDr7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQIcBAEBAgAGBQJQuXNVAAoJEJDCuSvBvK1Bgj8P+gJIDB0T09KV7mb1Nvf0L89j D8AuwntTmYIkFb7LMyMlq268GrZaNAqiXE8kcPTlpI6aCegVHuGv5395fgdRjY+c FG0kenH+nGLezyC5PYVwJXVgLmfIpmcaxWsArP3ukFSi3LiC8FSqmUfv9+/FQpw2 i7hzImg4eH0ogVyNm9iyiKla/niQHIt+wtX3bTpkclf3pW+fS20MBbgboCPN73QQ Cn1JJzlyLj+d5M3rsFaIXGvR8eCvc1mdQixz3BM+VF/iA97AOxGvIMz0AQXP6Gzw qvamP0A+PKSLMNbZda+Hix2XBz05LKKJfTCWwa+zNmmSe10M5Uxt97+g+n2EOV5v eN+N3Ngj5nDObtOwQ8QqBV5Zkl9rO1KIgeBJzGNdw4PyKGzUGauChWL6GINVpT8U MZTPpDVnR8zuutaYD5YLq1CuSUTPnA99QdSmQyNiMqUckHdJGqaqoL5+oPWZyS9g gpeP1NXDuyb/Pj1ltMgdkb+5NJj2Vkj6WAe57+QqpBRrlO+13WotgwO3nXI+sWHY E3tHMIFvmmvQF7duP9SukWf2WDZ3OEnI9wAwYsKPukTNrnMBXZh1qeHdE0dyrEcY 2vX5fCs7XpQwKHey4Szdexh5jiQPFCaPxYzK60Ac4oXpxIedlDA8O4L/HweTHWjM fHD39fNonZcZRj/dLxdI =9wZP -----END PGP SIGNATURE----- --4zKt6bo/V7G+vDr7--