JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* errno.cc (errmap): Add error codes for invalid binaries.

Browse Source 
* exec.cc (execvp): Call spawnve with _P_PATH_TYPE_EXEC flag
	from here.
	(execvpe): Ditto.
	* spawn.cc (spawn_guts): Filter _P_PATH_TYPE_EXEC from mode and
	store in p_type_exec.  Call av::fixup with addtional p_type_exec
	argument.
	(spawnve): Check for filtered mode.
	(spawnvpe): Add _P_PATH_TYPE_EXEC flag when calling spawnve.
	(av::fixup): Accept additional bool parameter p_type_exec.  Only check
	for script if p_type_exec is true.
	* winf.h (_P_PATH_TYPE_EXEC): Define.
	(_P_MODE): Define.
	(av::fixup): Declare with additional bool parameter.
This commit is contained in:
Corinna Vinschen
2011-01-19 09:15:17 +00:00
parent fc660168bf
commit 808aae3d13
5 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
winsup/cygwin/spawn.cc
View File

@@ -1,7 +1,7 @@
/* spawn.cc
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
This file is part of Cygwin.
@@ -280,6 +280,11 @@ spawn_guts (const char *prog_arg, const char *const *argv,
pid_t cygpid;
int res = -1;
/* Check if we have been called from exec{lv}p or spawn{lv}p and mask
mode to keep only the spawn mode. */
bool p_type_exec = !!(mode & _P_PATH_TYPE_EXEC);
mode = _P_MODE (mode);
if (prog_arg == NULL)
{
syscall_printf ("prog_arg is NULL");
@@ -375,7 +380,7 @@ spawn_guts (const char *prog_arg, const char *const *argv,
wascygexec = real_path.iscygexec ();
res = newargv.fixup (prog_arg, real_path, ext);
res = newargv.fixup (prog_arg, real_path, ext, p_type_exec);
if (res)
goto out;
@@ -861,7 +866,7 @@ spawnve (int mode, const char *path, const char *const *argv,
syscall_printf ("spawnve (%s, %s, %x)", path, argv[0], envp);
switch (mode)
switch (_P_MODE (mode))
{
case _P_OVERLAY:
/* We do not pass _P_SEARCH_PATH here. execve doesn't search PATH.*/
@@ -1002,11 +1007,12 @@ spawnvpe (int mode, const char *file, const char * const *argv,
const char * const *envp)
{
path_conv buf;
return spawnve (mode, find_exec (file, buf), argv, envp);
return spawnve (mode | _P_PATH_TYPE_EXEC, find_exec (file, buf), argv, envp);
}
int
av::fixup (const char *prog_arg, path_conv& real_path, const char *ext)
av::fixup (const char *prog_arg, path_conv& real_path, const char *ext,
bool p_type_exec)
{
const char *p;
bool exeext = ascii_strcasematch (ext, ".exe");
@@ -1053,6 +1059,13 @@ av::fixup (const char *prog_arg, path_conv& real_path, const char *ext)
/* ERROR_FILE_INVALID indicates very likely an empty file. */
if (GetLastError () == ERROR_FILE_INVALID)
{
if (!p_type_exec)
{
/* Not called from exec[lv]p. Just leave. */
debug_printf ("zero length file.");
set_errno (ENOEXEC);
return -1;
}
debug_printf ("zero length file, treat as script.");
goto just_shell;
}
@@ -1085,6 +1098,14 @@ av::fixup (const char *prog_arg, path_conv& real_path, const char *ext)
}
}
if (!p_type_exec)
{
/* Not called from exec[lv]p. Don't try to treat as script. */
debug_printf ("%s is not a valid executable", real_path.get_win32 ());
set_errno (ENOEXEC);
return -1;
}
debug_printf ("%s is possibly a script", real_path.get_win32 ());
ptr = buf;