From owner-svn-src-head@freebsd.org Wed Mar 28 03:07:03 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EE5FF52BD2; Wed, 28 Mar 2018 03:07:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 31E2471283; Wed, 28 Mar 2018 03:07:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C59B25181; Wed, 28 Mar 2018 03:07:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2S373Gk055056; Wed, 28 Mar 2018 03:07:03 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2S373EP055055; Wed, 28 Mar 2018 03:07:03 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201803280307.w2S373EP055055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 28 Mar 2018 03:07:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331657 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 331657 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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, 28 Mar 2018 03:07:03 -0000 Author: mjg Date: Wed Mar 28 03:07:02 2018 New Revision: 331657 URL: https://svnweb.freebsd.org/changeset/base/331657 Log: fd: tighten seq protected areas to not contain malloc/free Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Tue Mar 27 22:49:06 2018 (r331656) +++ head/sys/kern/kern_descrip.c Wed Mar 28 03:07:02 2018 (r331657) @@ -111,6 +111,11 @@ static void fdgrowtable_exp(struct filedesc *fdp, int static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); static int getmaxfd(struct thread *td); +static u_long *filecaps_copy_prep(const struct filecaps *src); +static void filecaps_copy_finish(const struct filecaps *src, + struct filecaps *dst, u_long *ioctls); +static u_long *filecaps_free_prep(struct filecaps *fcaps); +static void filecaps_free_finish(u_long *ioctls); /* * Each process has: @@ -302,12 +307,12 @@ fdfree(struct filedesc *fdp, int fd) #ifdef CAPABILITIES seq_write_begin(&fde->fde_seq); #endif - fdefree_last(fde); fde->fde_file = NULL; - fdunused(fdp, fd); #ifdef CAPABILITIES seq_write_end(&fde->fde_seq); #endif + fdefree_last(fde); + fdunused(fdp, fd); } void @@ -813,6 +818,7 @@ kern_dup(struct thread *td, u_int mode, int flags, int struct filedescent *oldfde, *newfde; struct proc *p; struct file *delfp; + u_long *oioctls, *nioctls; int error, maxfd; p = td->td_proc; @@ -902,15 +908,18 @@ kern_dup(struct thread *td, u_int mode, int flags, int newfde = &fdp->fd_ofiles[new]; delfp = newfde->fde_file; + oioctls = filecaps_free_prep(&newfde->fde_caps); + nioctls = filecaps_copy_prep(&oldfde->fde_caps); + /* * Duplicate the source descriptor. */ #ifdef CAPABILITIES seq_write_begin(&newfde->fde_seq); #endif - filecaps_free(&newfde->fde_caps); memcpy(newfde, oldfde, fde_change_size); - filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps, true); + filecaps_copy_finish(&oldfde->fde_caps, &newfde->fde_caps, + nioctls); if ((flags & FDDUP_FLAG_CLOEXEC) != 0) newfde->fde_flags = oldfde->fde_flags | UF_EXCLOSE; else @@ -918,6 +927,7 @@ kern_dup(struct thread *td, u_int mode, int flags, int #ifdef CAPABILITIES seq_write_end(&newfde->fde_seq); #endif + filecaps_free_finish(oioctls); td->td_retval[0] = new; error = 0; @@ -1503,6 +1513,40 @@ filecaps_copy(const struct filecaps *src, struct filec return (0); } +static u_long * +filecaps_copy_prep(const struct filecaps *src) +{ + u_long *ioctls; + size_t size; + + if (src->fc_ioctls == NULL) + return (NULL); + + KASSERT(src->fc_nioctls > 0, + ("fc_ioctls != NULL, but fc_nioctls=%hd", src->fc_nioctls)); + + size = sizeof(src->fc_ioctls[0]) * src->fc_nioctls; + ioctls = malloc(size, M_FILECAPS, M_WAITOK); + return (ioctls); +} + +static void +filecaps_copy_finish(const struct filecaps *src, struct filecaps *dst, + u_long *ioctls) +{ + size_t size; + + *dst = *src; + if (src->fc_ioctls == NULL) { + MPASS(ioctls == NULL); + return; + } + + size = sizeof(src->fc_ioctls[0]) * src->fc_nioctls; + dst->fc_ioctls = ioctls; + bcopy(src->fc_ioctls, dst->fc_ioctls, size); +} + /* * Move filecaps structure to the new place and clear the old place. */ @@ -1538,6 +1582,23 @@ filecaps_free(struct filecaps *fcaps) bzero(fcaps, sizeof(*fcaps)); } +static u_long * +filecaps_free_prep(struct filecaps *fcaps) +{ + u_long *ioctls; + + ioctls = fcaps->fc_ioctls; + bzero(fcaps, sizeof(*fcaps)); + return (ioctls); +} + +static void +filecaps_free_finish(u_long *ioctls) +{ + + free(ioctls, M_FILECAPS); +} + /* * Validate the given filecaps structure. */ @@ -2963,6 +3024,7 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int { struct filedescent *newfde, *oldfde; struct file *fp; + u_long *ioctls; int error, indx; KASSERT(openerror == ENODEV || openerror == ENXIO, @@ -3007,11 +3069,13 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int fhold(fp); newfde = &fdp->fd_ofiles[indx]; oldfde = &fdp->fd_ofiles[dfd]; + ioctls = filecaps_copy_prep(&oldfde->fde_caps); #ifdef CAPABILITIES seq_write_begin(&newfde->fde_seq); #endif memcpy(newfde, oldfde, fde_change_size); - filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps, true); + filecaps_copy_finish(&oldfde->fde_caps, &newfde->fde_caps, + ioctls); #ifdef CAPABILITIES seq_write_end(&newfde->fde_seq); #endif