svn commit: r352016 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sat Sep  7 16:05:17 2019
New Revision: 352016
URL: https://svnweb.freebsd.org/changeset/base/352016

Log:
  In do_execve(), clear imgp->textset when restarting for interpreter.
  
  Otherwise, we might left the boolean set, which would affect cleanup
  after an error on interpreter activation.
  
  Reviewed by:	markj
  MFC after:	1 week
  Differential revision:	https://reviews.freebsd.org/D21560

Modified:
  head/sys/kern/kern_exec.c

Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c	Sat Sep  7 16:03:26 2019	(r352015)
+++ head/sys/kern/kern_exec.c	Sat Sep  7 16:05:17 2019	(r352016)
@@ -616,7 +616,9 @@ interpret:
 		 * The vnode lock is held over this entire period
 		 * so nothing should illegitimately be blocked.
 		 */
-		VOP_UNSET_TEXT_CHECKED(imgp->vp);
+		MPASS(imgp->textset);
+		VOP_UNSET_TEXT_CHECKED(newtextvp);
+		imgp->textset = false;
 		/* free name buffer and old vnode */
 		if (args->fname != NULL)
 			NDFREE(&nd, NDF_ONLY_PNBUF);