Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrectly 0'd userspace entry pointer; bad pointer validate in stat_node

Browse Source
This commit is contained in:
Kevin Lange 2015-05-29 16:12:04 -07:00
parent a4d749a91a
commit 027d979fbc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/misc/elf.c
View File

@ -43,12 +43,15 @@ int exec_elf(char * path, fs_node_t * file, int argc, char ** argv, char ** env)
release_directory_for_exec(current_directory);
invalidate_page_tables();
current_process->image.entry = 0xFFFFFFFF;
/* Load the loadable segments from the binary */
for (uintptr_t x = 0; x < (uint32_t)header->e_shentsize * header->e_shnum; x += header->e_shentsize) {
/* read a section header */
Elf32_Shdr * shdr = (Elf32_Shdr *)((uintptr_t)header + (header->e_shoff + x));
if (shdr->sh_addr) {
/* If this is a loadable section, load it up. */
if (shdr->sh_addr == 0) continue; /* skip sections that try to load to 0 */
if (shdr->sh_addr < current_process->image.entry) {
/* If this is the lowest entry point, store it for memory reasons */
current_process->image.entry = shdr->sh_addr;

1
kernel/sys/syscall.c
View File

@ -256,7 +256,6 @@ static int sys_seek(int fd, int offset, int whence) {
static int stat_node(fs_node_t * fn, uintptr_t st) {
struct stat * f = (struct stat *)st;
PTR_VALIDATE(fn);
PTR_VALIDATE(f);
if (!fn) {