From b0bc0cadbe44ca7eb4fae2369126ffb5307b68f4 Mon Sep 17 00:00:00 2001
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sat, 28 Jun 2014 05:51:45 +0000
Subject: [PATCH] Call fdcloseexec right after fdunshare.

No functional changes.

MFC after:	1 week
---
 sys/kern/kern_exec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 1d3a46d439a..53182db530b 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -595,6 +595,8 @@ do_execve(td, args, mac_p)
 	 * be shared after an exec.
 	 */
 	fdunshare(td);
+	/* close files on exec */
+	fdcloseexec(td);
 
 	/*
 	 * Malloc things before we need locks.
@@ -608,8 +610,6 @@ do_execve(td, args, mac_p)
 		bcopy(imgp->args->begin_argv, newargs->ar_args, i);
 	}
 
-	/* close files on exec */
-	fdcloseexec(td);
 	vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
 
 	/* Get a reference to the vnode prior to locking the proc */