svn commit: r352327 - stable/12/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sat Sep 14 13:32:13 2019
New Revision: 352327
URL: https://svnweb.freebsd.org/changeset/base/352327

Log:
  MFC r352016:
  In do_execve(), clear imgp->textset when restarting for interpreter.

Modified:
  stable/12/sys/kern/kern_exec.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/kern_exec.c
==============================================================================
--- stable/12/sys/kern/kern_exec.c	Sat Sep 14 13:31:07 2019	(r352326)
+++ stable/12/sys/kern/kern_exec.c	Sat Sep 14 13:32:13 2019	(r352327)
@@ -618,7 +618,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);