From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 16 19:15:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29E9316A425 for ; Thu, 16 Mar 2006 19:15:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3BF43D90 for ; Thu, 16 Mar 2006 19:15:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 19D3246C0B for ; Thu, 16 Mar 2006 14:15:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0641014C68D; Thu, 16 Mar 2006 19:07:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F3B2616A423; Thu, 16 Mar 2006 19:07:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2DE216A400 for ; Thu, 16 Mar 2006 19:07:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8119643D48 for ; Thu, 16 Mar 2006 19:07:33 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2GJ7XvD097187 for ; Thu, 16 Mar 2006 19:07:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2GJ7XRR097184 for perforce@freebsd.org; Thu, 16 Mar 2006 19:07:33 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Mar 2006 19:07:33 GMT Message-Id: <200603161907.k2GJ7XRR097184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93409 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2006 19:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93409 Change 93409 by millert@millert_p3 on 2006/03/16 19:06:34 Fix some apparent merge errors, primarily in error paths. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#17 (text+ko) ==== @@ -474,6 +474,8 @@ (struct vnode *)fp->f_data, mode); VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); if (error) { + FILE_UNLOCK(fp); + FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; } @@ -485,6 +487,8 @@ fp->f_flag, (fp->f_flag & ~FCNTLFLAGS) | (FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS)); if (error) { + FILE_UNLOCK(fp); + FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; } @@ -723,6 +727,9 @@ #ifdef MAC error = mac_check_file_dup(td->td_ucred, fp, new); if (error) { + /* we've allocated a descriptor which we won't use */ + if (fdp->fd_ofiles[new] == NULL) + fdunused(fdp, new); FILEDESC_UNLOCK(fdp); fdrop(fp, td); return (error); @@ -1858,7 +1865,8 @@ for (i = 0; i <= fdp->fd_lastfile; i++) { #ifdef MAC if (fdp->fd_ofiles[i] != NULL && - ((fdp->fd_ofileflags[i] & UF_EXCLOSE) || + (fdp->fd_ofiles[i]->f_type == DTYPE_MQUEUE || + (fdp->fd_ofileflags[i] & UF_EXCLOSE) || mac_check_file_inherit(td->td_ucred, fdp->fd_ofiles[i]))) { #else if (fdp->fd_ofiles[i] != NULL &&