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
e72de28
..
cca55b4
100644
(file)
--- a/
KernelLand/Kernel/binary.c
+++ b/
KernelLand/Kernel/binary.c
@@
-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(;;);
@@
-768,17
+776,7
@@
void *Binary_LoadKernel(const char *File)
pKBinary->Next = glLoadedKernelLibs;
glLoadedKernelLibs = pKBinary;
SHORTREL( &glKBinListLock );
pKBinary->Next = glLoadedKernelLibs;
glLoadedKernelLibs = pKBinary;
SHORTREL( &glKBinListLock );
-
- // Relocate Library
- if( !Binary_Relocate( (void*)base ) )
- {
- Log_Warning("Binary", "Relocation of '%s' failed, unloading", File);
- Binary_Unload( (void*)base );
- Binary_Dereference( pBinary );
- LEAVE('n');
- return 0;
- }
-
+
LEAVE('p', base);
return (void*)base;
}
LEAVE('p', base);
return (void*)base;
}
@@
-832,9
+830,12
@@
Uint Binary_GetSymbolEx(const char *Name, Uint *Value)
tKernelBin *pKBin;
int numKSyms = ((Uint)&gKernelSymbolsEnd-(Uint)&gKernelSymbols)/sizeof(tKernelSymbol);
tKernelBin *pKBin;
int numKSyms = ((Uint)&gKernelSymbolsEnd-(Uint)&gKernelSymbols)/sizeof(tKernelSymbol);
+ LOG("numKSyms = %i", numKSyms);
+
// Scan Kernel
for( i = 0; i < numKSyms; i++ )
{
// Scan Kernel
for( i = 0; i < numKSyms; i++ )
{
+ LOG("KSym %s = %p", gKernelSymbols[i].Name, gKernelSymbols[i].Value);
if(strcmp(Name, gKernelSymbols[i].Name) == 0) {
*Value = gKernelSymbols[i].Value;
return 1;
if(strcmp(Name, gKernelSymbols[i].Name) == 0) {
*Value = gKernelSymbols[i].Value;
return 1;
@@
-891,12
+892,12
@@
int Binary_int_CheckMemFree( tVAddr _start, size_t _len )
_start &= ~(PAGE_SIZE-1);
LOG("_start = %p, _len = 0x%x", _start, _len);
for( ; _len > PAGE_SIZE; _len -= PAGE_SIZE, _start += PAGE_SIZE ) {
_start &= ~(PAGE_SIZE-1);
LOG("_start = %p, _len = 0x%x", _start, _len);
for( ; _len > PAGE_SIZE; _len -= PAGE_SIZE, _start += PAGE_SIZE ) {
- if( MM_GetPhysAddr(
_start
) != 0 ) {
+ if( MM_GetPhysAddr(
(void*)_start
) != 0 ) {
LEAVE('i', 1);
return 1;
}
}
LEAVE('i', 1);
return 1;
}
}
- if( _len == PAGE_SIZE && MM_GetPhysAddr(
_start
) != 0 ) {
+ if( _len == PAGE_SIZE && MM_GetPhysAddr(
(void*)_start
) != 0 ) {
LEAVE('i', 1);
return 1;
}
LEAVE('i', 1);
return 1;
}
UCC
git Repository :: git.ucc.asn.au