D6546.id16939.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6546.id16939.diff
View Options

	Index: sys/kern/kern_exec.c
	===================================================================
	--- sys/kern/kern_exec.c
	+++ sys/kern/kern_exec.c
	@@ -568,6 +568,19 @@
	/* The new credentials are installed into the process later. */

	/*
	+ * Do the best to calculate the full path to the image file.
	+ */
	+ if (args->fname != NULL && args->fname[0] == '/')
	+ imgp->execpath = args->fname;
	+ else {
	+ VOP_UNLOCK(imgp->vp, 0);
	+ if (vn_fullpath(td, imgp->vp, &imgp->execpath,
	+ &imgp->freepath) != 0)
	+ imgp->execpath = args->fname;
	+ vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
	+ }
	+
	+ /*
	* If the current process has a special image activator it
	* wants to try first, call it. For example, emulating shell
	* scripts differently.
	@@ -629,6 +642,9 @@
	crfree(imgp->newcred);
	imgp->newcred = NULL;
	}
	+ imgp->execpath = NULL;
	+ free(imgp->freepath, M_TEMP);
	+ imgp->freepath = NULL;
	/* set new name to that of the interpreter */
	NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,
	UIO_SYSSPACE, imgp->interpreter_name, td);
	@@ -642,14 +658,6 @@
	*/
	VOP_UNLOCK(imgp->vp, 0);

	- /*
	- * Do the best to calculate the full path to the image file.
	- */
	- if (imgp->auxargs != NULL &&
	- ((args->fname != NULL && args->fname[0] == '/') \|\|
	- vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
	- imgp->execpath = args->fname;
	-
	if (disallow_high_osrel &&
	P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
	error = ENOEXEC;