git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/UDI - Adding PCI and MEI headers
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
binary.c
diff --git
a/KernelLand/Kernel/binary.c
b/KernelLand/Kernel/binary.c
index
ec5db13
..
cca55b4
100644
(file)
--- a/
KernelLand/Kernel/binary.c
+++ b/
KernelLand/Kernel/binary.c
@@
-2,7
+2,7
@@
* Acess2
* Common Binary Loader
*/
* Acess2
* Common Binary Loader
*/
-#define DEBUG
1
+#define DEBUG
0
#include <acess.h>
#include <binary.h>
#include <mm_virt.h>
#include <acess.h>
#include <binary.h>
#include <mm_virt.h>
@@
-32,6
+32,7
@@
extern tBinaryType gELF_Info;
// === PROTOTYPES ===
int Binary_int_CacheArgs(const char **Path, const char ***ArgV, const char ***EnvP, void *DestBuffer);
// === PROTOTYPES ===
int Binary_int_CacheArgs(const char **Path, const char ***ArgV, const char ***EnvP, void *DestBuffer);
+ int Proc_int_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize, bool bClearUser);
tVAddr Binary_Load(const char *Path, tVAddr *EntryPoint);
tBinary *Binary_GetInfo(tMount MountID, tInode InodeID);
tVAddr Binary_MapIn(tBinary *Binary, const char *Path, tVAddr LoadMin, tVAddr LoadMax);
tVAddr Binary_Load(const char *Path, tVAddr *EntryPoint);
tBinary *Binary_GetInfo(tMount MountID, tInode InodeID);
tVAddr Binary_MapIn(tBinary *Binary, const char *Path, tVAddr LoadMin, tVAddr LoadMax);
@@
-191,12
+192,13
@@
int Proc_SysSpawn(const char *Binary, const char **ArgV, const char **EnvP, int
VFS_RestoreHandles(nFD, handles);
VFS_FreeSavedHandles(nFD, handles);
// Frees cachebuf
VFS_RestoreHandles(nFD, handles);
VFS_FreeSavedHandles(nFD, handles);
// Frees cachebuf
- Proc_
Execve(Binary, ArgV, EnvP, size
);
+ Proc_
int_Execve(Binary, ArgV, EnvP, size, 0
);
for(;;);
}
for(;;);
}
- if( ret
< 0
)
+ if( ret
== -1
)
{
VFS_FreeSavedHandles(nFD, handles);
{
VFS_FreeSavedHandles(nFD, handles);
+ free(cachebuf);
}
return ret;
}
return ret;
@@
-210,6
+212,11
@@
int Proc_SysSpawn(const char *Binary, const char **ArgV, const char **EnvP, int
* \note Called Proc_ for historical reasons
*/
int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize)
* \note Called Proc_ for historical reasons
*/
int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize)
+{
+ return Proc_int_Execve(File, ArgV, EnvP, DataSize, 1);
+}
+
+int Proc_int_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize, bool bClearUser)
{
void *cachebuf;
tVAddr entry;
{
void *cachebuf;
tVAddr entry;
@@
-235,6
+242,7
@@
int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int Data
// --- Clear User Address space
// NOTE: This is a little roundabout, maybe telling ClearUser to not touch the
// PPD area would be a better idea.
// --- Clear User Address space
// NOTE: This is a little roundabout, maybe telling ClearUser to not touch the
// PPD area would be a better idea.
+ if( bClearUser )
{
int nfd = *Threads_GetMaxFD();
void *handles;
{
int nfd = *Threads_GetMaxFD();
void *handles;
@@
-249,7
+257,7
@@
int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int Data
base = Binary_Load(File, &entry);
if(base == 0)
{
base = Binary_Load(File, &entry);
if(base == 0)
{
- Log_Warning("Binary", "Proc_Execve - Unable to load '%s'
", File
);
+ Log_Warning("Binary", "Proc_Execve - Unable to load '%s'
[errno=%i]", File, errno
);
LEAVE('-');
Threads_Exit(0, -10);
for(;;);
LEAVE('-');
Threads_Exit(0, -10);
for(;;);
UCC
git Repository :: git.ucc.asn.au