D19874.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19874.diff
View Options

	Index: head/sys/kern/imgact_elf.c
	===================================================================
	--- head/sys/kern/imgact_elf.c
	+++ head/sys/kern/imgact_elf.c
	@@ -716,7 +716,7 @@
	struct nameidata *nd;
	struct vattr *attr;
	struct image_params *imgp;
	- u_long rbase;
	+ u_long flags, rbase;
	u_long base_addr = 0;
	int error;

	@@ -744,7 +744,10 @@
	imgp->object = NULL;
	imgp->execlabel = NULL;

	- NDINIT(nd, LOOKUP, LOCKLEAF \| FOLLOW, UIO_SYSSPACE, file, curthread);
	+ flags = FOLLOW \| LOCKSHARED \| LOCKLEAF;
	+
	+again:
	+ NDINIT(nd, LOOKUP, flags, UIO_SYSSPACE, file, curthread);
	if ((error = namei(nd)) != 0) {
	nd->ni_vp = NULL;
	goto fail;
	@@ -759,15 +762,30 @@
	if (error)
	goto fail;

	+ /*
	+ * Also make certain that the interpreter stays the same,
	+ * so set its VV_TEXT flag, too. Since this function is only
	+ * used to load the interpreter, the VV_TEXT is almost always
	+ * already set.
	+ */
	+ if (VOP_IS_TEXT(nd->ni_vp) == 0) {
	+ if (VOP_ISLOCKED(nd->ni_vp) != LK_EXCLUSIVE) {
	+ /*
	+ * LK_UPGRADE could have resulted in dropping
	+ * the lock. Just try again from the start,
	+ * this time with exclusive vnode lock.
	+ */
	+ vput(nd->ni_vp);
	+ flags &= ~LOCKSHARED;
	+ goto again;
	+ }
	+
	+ VOP_SET_TEXT(nd->ni_vp);
	+ }
	+
	error = exec_map_first_page(imgp);
	if (error)
	goto fail;
	-
	- /*
	- * Also make certain that the interpreter stays the same, so set
	- * its VV_TEXT flag, too.
	- */
	- VOP_SET_TEXT(nd->ni_vp);

	imgp->object = nd->ni_vp->v_object;