From owner-svn-src-head@FreeBSD.ORG Wed Oct 22 07:51:38 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBA56E5D; Wed, 22 Oct 2014 07:51:38 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48A085F0; Wed, 22 Oct 2014 07:51:38 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s9M7pWvW087002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 22 Oct 2014 10:51:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s9M7pWvW087002 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id s9M7pVku087001; Wed, 22 Oct 2014 10:51:31 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 22 Oct 2014 10:51:31 +0300 From: Konstantin Belousov To: Mateusz Guzik Subject: Re: svn commit: r273441 - in head/sys: kern sys Message-ID: <20141022075131.GG1877@kib.kiev.ua> References: <201410220023.s9M0NiBX089974@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201410220023.s9M0NiBX089974@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) 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 autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2014 07:51:38 -0000 On Wed, Oct 22, 2014 at 12:23:44AM +0000, Mateusz Guzik wrote: > Author: mjg > Date: Wed Oct 22 00:23:43 2014 > New Revision: 273441 > URL: https://svnweb.freebsd.org/changeset/base/273441 > > Log: > filedesc: cleanup setugidsafety a little > > Rename it to fdsetugidsafety for consistency with other functions. > > There is no need to take filedesc lock if not closing any files. > > The loop has to verify each file and we are guaranteed fdtable has space > for at least 20 fds. As such there is no need to check fd_lastfile. ^^^^^^^^^^^^^^^^^^^^^^^^ * > > While here tidy up is_unsafe. > > Modified: > head/sys/kern/kern_descrip.c > head/sys/kern/kern_exec.c > head/sys/sys/filedesc.h > > Modified: head/sys/kern/kern_descrip.c > ============================================================================== > --- head/sys/kern/kern_descrip.c Tue Oct 21 23:57:31 2014 (r273440) > +++ head/sys/kern/kern_descrip.c Wed Oct 22 00:23:43 2014 (r273441) > @@ -2078,23 +2078,23 @@ fdescfree(struct thread *td) > * Since setugidsafety calls this only for fd 0, 1 and 2, this check is > * sufficient. We also don't check for setugidness since we know we are. > */ > -static int > +static bool > is_unsafe(struct file *fp) > { > - if (fp->f_type == DTYPE_VNODE) { > - struct vnode *vp = fp->f_vnode; > + struct vnode *vp; > > - if ((vp->v_vflag & VV_PROCDEP) != 0) > - return (1); > - } > - return (0); > + if (fp->f_type != DTYPE_VNODE) > + return (false); > + > + vp = fp->f_vnode; > + return ((vp->v_vflag & VV_PROCDEP) != 0); > } > > /* > * Make this setguid thing safe, if at all possible. > */ > void > -setugidsafety(struct thread *td) > +fdsetugidsafety(struct thread *td) > { > struct filedesc *fdp; > struct file *fp; > @@ -2102,12 +2102,10 @@ setugidsafety(struct thread *td) > > fdp = td->td_proc->p_fd; > KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared")); > - FILEDESC_XLOCK(fdp); > - for (i = 0; i <= fdp->fd_lastfile; i++) { > - if (i > 2) > - break; > + for (i = 0; i <= 2; i++) { [*] This requires an assert. > fp = fdp->fd_ofiles[i].fde_file; > if (fp != NULL && is_unsafe(fp)) { > + FILEDESC_XLOCK(fdp); > knote_fdclose(td, i); > /* > * NULL-out descriptor prior to close to avoid