svn commit: r271141 - in head/sys: kern sys

[Sean Bruno]

Author: sbruno
Date: Thu Sep  4 21:31:25 2014
New Revision: 271141
URL: http://svnweb.freebsd.org/changeset/base/271141

Log:
  Allow multiple image activators to run on the same execution by changing
  imgp->interpreted to a bitmask instead of, functionally, a bool. Each
  imgactivator now requires its own flag in interpreted to indicate whether
  or not it has already examined argv[0].
  
  Change imgp->interpreted to an unsigned char to add one extra bit for
  future use.
  
  With this change, one can execute a shell script from a 64bit host native
  make and still get the binmisc image activator to fire for the script
  interpreter.  Prior to this, execution would fail.
  
  Phabric:	https://reviews.freebsd.org/D696
  Reviewed by:	jhb@
  MFC after:	4 weeks

Modified:
  head/sys/kern/imgact_binmisc.c
  head/sys/kern/imgact_shell.c
  head/sys/sys/imgact.h

Modified: head/sys/kern/imgact_binmisc.c
==============================================================================
--- head/sys/kern/imgact_binmisc.c	Thu Sep  4 21:28:25 2014	(r271140)
+++ head/sys/kern/imgact_binmisc.c	Thu Sep  4 21:31:25 2014	(r271141)
@@ -600,12 +600,12 @@ imgact_binmisc_exec(struct image_params 
 	}
 
 	/* No interpreter nesting allowed. */
-	if (imgp->interpreted) {
+	if (imgp->interpreted & IMGACT_BINMISC) {
 		mtx_unlock(&interp_list_mtx);
 		return (ENOEXEC);
 	}
 
-	imgp->interpreted = 1;
+	imgp->interpreted |= IMGACT_BINMISC;
 
 	if (imgp->args->fname != NULL) {
 		fname = imgp->args->fname;

Modified: head/sys/kern/imgact_shell.c
==============================================================================
--- head/sys/kern/imgact_shell.c	Thu Sep  4 21:28:25 2014	(r271140)
+++ head/sys/kern/imgact_shell.c	Thu Sep  4 21:31:25 2014	(r271141)
@@ -115,10 +115,10 @@ exec_shell_imgact(imgp)
 	 * Don't allow a shell script to be the shell for a shell
 	 *	script. :-)
 	 */
-	if (imgp->interpreted)
+	if (imgp->interpreted & IMGACT_SHELL)
 		return (ENOEXEC);
 
-	imgp->interpreted = 1;
+	imgp->interpreted |= IMGACT_SHELL;
 
 	/*
 	 * At this point we have the first page of the file mapped.

Modified: head/sys/sys/imgact.h
==============================================================================
--- head/sys/sys/imgact.h	Thu Sep  4 21:28:25 2014	(r271140)
+++ head/sys/sys/imgact.h	Thu Sep  4 21:31:25 2014	(r271141)
@@ -61,7 +61,9 @@ struct image_params {
 	unsigned long entry_addr; /* entry address of target executable */
 	unsigned long reloc_base; /* load address of image */
 	char vmspace_destroyed;	/* flag - we've blown away original vm space */
-	char interpreted;	/* flag - this executable is interpreted */
+#define IMGACT_SHELL	0x1
+#define IMGACT_BINMISC	0x2
+	unsigned char interpreted;	/* mask of interpreters that have run */
 	char opened;		/* flag - we have opened executable vnode */
 	char *interpreter_name;	/* name of the interpreter */
 	void *auxargs;		/* ELF Auxinfo structure pointer */