Call fdcloseexec right after fdunshare.

No functional changes.

MFC after:	1 week

This commit is contained in:

Mateusz Guzik

2014-06-28 05:51:45 +00:00

parent b9d32c36fa

commit b0bc0cadbe

1 changed files with 2 additions and 2 deletions

									
										sys/kern/kern_exec.c
									
		+2
		-2
	
												View File
												
				@@ -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 */