svashisht / rpms / bash

Forked from rpms/bash 6 years ago
Clone
498f26e
diff --git a/config.h.in b/config.h.in
91692f1
index 0adc903..366e639 100644
498f26e
--- a/config.h.in
498f26e
+++ b/config.h.in
91692f1
@@ -758,6 +758,9 @@
498f26e
 /* Define if you have the pselect function.  */
498f26e
 #undef HAVE_PSELECT
Roman Rakus f2e7e18
 
Roman Rakus f2e7e18
+/* Define if you have the pread function. */
Roman Rakus f2e7e18
+#undef HAVE_PREAD
Roman Rakus f2e7e18
+
Roman Rakus f2e7e18
 /* Define if you have the putenv function.  */
Roman Rakus f2e7e18
 #undef HAVE_PUTENV
Roman Rakus f2e7e18
 
91692f1
@@ -956,6 +959,9 @@
Roman Rakus f2e7e18
 /* Define if you have the <dlfcn.h> header file.  */
Roman Rakus f2e7e18
 #undef HAVE_DLFCN_H
Roman Rakus f2e7e18
 
Roman Rakus f2e7e18
+/* Define if you have the <elf.h> header file.  */
Roman Rakus f2e7e18
+#undef HAVE_ELF_H
Roman Rakus f2e7e18
+
Roman Rakus f2e7e18
 /* Define if you have the <grp.h> header file.  */
Roman Rakus f2e7e18
 #undef HAVE_GRP_H
Roman Rakus f2e7e18
 
498f26e
diff --git a/configure.ac b/configure.ac
91692f1
index 2c74f13..4e9c3a4 100644
498f26e
--- a/configure.ac
498f26e
+++ b/configure.ac
91692f1
@@ -782,7 +782,7 @@ dnl checks for system calls
Roman Rakus f2e7e18
 AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
Roman Rakus f2e7e18
 		getpagesize getpeername getrlimit getrusage gettimeofday \
91692f1
 		kill killpg lstat pselect readlink select setdtablesize \
Roman Rakus f2e7e18
-		setitimer tcgetpgrp uname ulimit waitpid)
Roman Rakus f2e7e18
+		setitimer tcgetpgrp uname ulimit waitpid pread)
Roman Rakus f2e7e18
 AC_REPLACE_FUNCS(rename)
Roman Rakus f2e7e18
 
Roman Rakus f2e7e18
 dnl checks for c library functions
498f26e
diff --git a/execute_cmd.c b/execute_cmd.c
91692f1
index 4eae19c..0af6f8f 100644
498f26e
--- a/execute_cmd.c
498f26e
+++ b/execute_cmd.c
Roman Rakus 87b6511
@@ -41,6 +41,10 @@
cvsdist 8b5e1e8
 #  include <unistd.h>
cvsdist 8b5e1e8
 #endif
cvsdist 8b5e1e8
 
cvsdist 8b5e1e8
+#ifdef HAVE_ELF_H
cvsdist 8b5e1e8
+# include <elf.h>
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
 #include "posixtime.h"
cvsdist 8b5e1e8
 
cvsdist 8b5e1e8
 #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
91692f1
@@ -5706,6 +5710,14 @@ shell_execve (command, args, env)
cvsdist 8b5e1e8
 	{
cvsdist 57ff95e
 	  /* The file has the execute bits set, but the kernel refuses to
cvsdist 57ff95e
 	     run it for some reason.  See why. */
cvsdist 8b5e1e8
+#if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
498f26e
+       int fd = open (command, O_RDONLY);
cvsdist 8b5e1e8
+
498f26e
+       if (fd >= 0)
498f26e
+               sample_len = read (fd, sample, sizeof (sample));
498f26e
+       else
498f26e
+               sample_len = -1;
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
 #if defined (HAVE_HASH_BANG_EXEC)
498f26e
 	  READ_SAMPLE_BUF (command, sample, sample_len);
498f26e
 	  if (sample_len > 0)
91692f1
@@ -5715,6 +5727,7 @@ shell_execve (command, args, env)
cvsdist 8b5e1e8
 	      char *interp;
d98c1bc
 	      int ilen;
cvsdist 8b5e1e8
 
91692f1
+          close (fd);
cvsdist 8b5e1e8
 	      interp = getinterp (sample, sample_len, (int *)NULL);
d98c1bc
 	      ilen = strlen (interp);
cvsdist 8b5e1e8
 	      errno = i;
91692f1
@@ -5730,7 +5743,138 @@ shell_execve (command, args, env)
cvsdist 8b5e1e8
 	      return (EX_NOEXEC);
cvsdist 8b5e1e8
 	    }
cvsdist 8b5e1e8
 #endif
91692f1
-	  errno = i;
cvsdist 8b5e1e8
+#if defined (HAVE_ELF_H)
cvsdist 8b5e1e8
+	  if (i == ENOENT
cvsdist 8b5e1e8
+	      && sample_len > EI_NIDENT
cvsdist 8b5e1e8
+	      && memcmp (sample, ELFMAG, SELFMAG) == 0)
cvsdist 8b5e1e8
+	    {
cvsdist 8b5e1e8
+	      off_t offset = -1;
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+	      /* It is an ELF file.  Now determine whether it is dynamically
cvsdist 8b5e1e8
+		 linked and if yes, get the offset of the interpreter
cvsdist 8b5e1e8
+		 string.  */
cvsdist 8b5e1e8
+	      if (sample[EI_CLASS] == ELFCLASS32
cvsdist 8b5e1e8
+		  && sample_len > sizeof (Elf32_Ehdr))
cvsdist 8b5e1e8
+		{
cvsdist 8b5e1e8
+		  Elf32_Ehdr ehdr;
cvsdist 8b5e1e8
+		  Elf32_Phdr *phdr;
cvsdist 8b5e1e8
+		  int nphdr;
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  /* We have to copy the data since the sample buffer
cvsdist 8b5e1e8
+		     might not be aligned correctly to be accessed as
cvsdist 8b5e1e8
+		     an Elf32_Ehdr struct.  */
cvsdist 8b5e1e8
+		  memcpy (&ehdr, sample, sizeof (Elf32_Ehdr));
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  nphdr = ehdr.e_phnum;
cvsdist 8b5e1e8
+		  phdr = (Elf32_Phdr *) malloc (nphdr * ehdr.e_phentsize);
cvsdist 8b5e1e8
+		  if (phdr != NULL)
cvsdist 8b5e1e8
+		    {
cvsdist 8b5e1e8
+#ifdef HAVE_PREAD
cvsdist 8b5e1e8
+		      sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
cvsdist 8b5e1e8
+					  ehdr.e_phoff);
cvsdist 8b5e1e8
+#else
cvsdist 8b5e1e8
+		      if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
cvsdist 8b5e1e8
+			sample_len = read (fd, phdr,
cvsdist 8b5e1e8
+					   nphdr * ehdr.e_phentsize);
cvsdist 8b5e1e8
+		      else
cvsdist 8b5e1e8
+			sample_len = -1;
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
+		      if (sample_len == nphdr * ehdr.e_phentsize)
cvsdist 8b5e1e8
+			while (nphdr-- > 0)
cvsdist 8b5e1e8
+			  if (phdr[nphdr].p_type == PT_INTERP)
cvsdist 8b5e1e8
+			    {
cvsdist 8b5e1e8
+			      offset = phdr[nphdr].p_offset;
cvsdist 8b5e1e8
+			      break;
cvsdist 8b5e1e8
+			    }
cvsdist 8b5e1e8
+		      free (phdr);
cvsdist 8b5e1e8
+		    }
cvsdist 8b5e1e8
+		}
cvsdist 8b5e1e8
+	      else if (sample[EI_CLASS] == ELFCLASS64
cvsdist 8b5e1e8
+		       && sample_len > sizeof (Elf64_Ehdr))
cvsdist 8b5e1e8
+		{
cvsdist 8b5e1e8
+		  Elf64_Ehdr ehdr;
cvsdist 8b5e1e8
+		  Elf64_Phdr *phdr;
cvsdist 8b5e1e8
+		  int nphdr;
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  /* We have to copy the data since the sample buffer
cvsdist 8b5e1e8
+		     might not be aligned correctly to be accessed as
cvsdist 8b5e1e8
+		     an Elf64_Ehdr struct.  */
cvsdist 8b5e1e8
+		  memcpy (&ehdr, sample, sizeof (Elf64_Ehdr));
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  nphdr = ehdr.e_phnum;
cvsdist 8b5e1e8
+		  phdr = (Elf64_Phdr *) malloc (nphdr * ehdr.e_phentsize);
cvsdist 8b5e1e8
+		  if (phdr != NULL)
cvsdist 8b5e1e8
+		    {
cvsdist 8b5e1e8
+#ifdef HAVE_PREAD
cvsdist 8b5e1e8
+		      sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
cvsdist 8b5e1e8
+					  ehdr.e_phoff);
cvsdist 8b5e1e8
+#else
cvsdist 8b5e1e8
+		      if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
cvsdist 8b5e1e8
+			sample_len = read (fd, phdr,
cvsdist 8b5e1e8
+					   nphdr * ehdr.e_phentsize);
cvsdist 8b5e1e8
+		      else
cvsdist 8b5e1e8
+			sample_len = -1;
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
+		      if (sample_len == nphdr * ehdr.e_phentsize)
cvsdist 8b5e1e8
+			while (nphdr-- > 0)
cvsdist 8b5e1e8
+			  if (phdr[nphdr].p_type == PT_INTERP)
cvsdist 8b5e1e8
+			    {
cvsdist 8b5e1e8
+			      offset = phdr[nphdr].p_offset;
cvsdist 8b5e1e8
+			      break;
cvsdist 8b5e1e8
+			    }
cvsdist 8b5e1e8
+		      free (phdr);
cvsdist 8b5e1e8
+		    }
cvsdist 8b5e1e8
+		}
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+	      if (offset != -1)
cvsdist 8b5e1e8
+		{
cvsdist 8b5e1e8
+		  size_t maxlen = 0;
cvsdist 8b5e1e8
+		  size_t actlen = 0;
cvsdist 8b5e1e8
+		  char *interp = NULL;
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  do
cvsdist 8b5e1e8
+		    {
cvsdist 8b5e1e8
+		      if (actlen == maxlen)
cvsdist 8b5e1e8
+			{
cvsdist 8b5e1e8
+			  char *newinterp = realloc (interp, maxlen += 200);
cvsdist 8b5e1e8
+			  if (newinterp == NULL)
cvsdist 8b5e1e8
+			    {
cvsdist 8b5e1e8
+			      actlen = 0;
cvsdist 8b5e1e8
+			      break;
cvsdist 8b5e1e8
+			    }
cvsdist 8b5e1e8
+			  interp = newinterp;
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+#ifdef HAVE_PREAD
cvsdist 8b5e1e8
+			  actlen = pread (fd, interp, maxlen, offset);
cvsdist 8b5e1e8
+#else
cvsdist 8b5e1e8
+			  if (lseek (fd, offset, SEEK_SET) != -1)
cvsdist 8b5e1e8
+			    actlen = read (fd, interp, maxlen);
cvsdist 8b5e1e8
+			  else
cvsdist 8b5e1e8
+			    actlen = -1;
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
+			}
cvsdist 8b5e1e8
+		    }
cvsdist 8b5e1e8
+		  while (actlen > 0 && memchr (interp, '\0', actlen) == NULL);
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  if (actlen > 0)
cvsdist 8b5e1e8
+		    {
cvsdist 8b5e1e8
+		      close (fd);
cvsdist 8b5e1e8
+		      errno = i;
cvsdist 8b5e1e8
+		      sys_error ("%s: %s: bad ELF interpreter", command,
cvsdist 8b5e1e8
+				 interp);
cvsdist 8b5e1e8
+		      free (interp);
cvsdist 8b5e1e8
+		      return (EX_NOEXEC);
cvsdist 8b5e1e8
+		    }
cvsdist 8b5e1e8
+
cvsdist 8b5e1e8
+		  free (interp);
cvsdist 8b5e1e8
+		}
cvsdist 8b5e1e8
+	    }
cvsdist 8b5e1e8
+#endif
cvsdist 8b5e1e8
+#if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
cvsdist 8b5e1e8
+	  close (fd);
cvsdist 8b5e1e8
+#endif
91692f1
+
91692f1
+      errno = i;
cvsdist 8b5e1e8
 	  file_error (command);
cvsdist 8b5e1e8
 	}
91692f1
       return (last_command_exit_value);
498f26e
-- 
91692f1
2.17.2
498f26e