1 files changed, 14 insertions, 7 deletions

diff --git a/pk/elf.c b/pk/elf.c
index ab56b58..f61f1da 100644
--- a/pk/elf.c
+++ b/pk/elf.c
@@ -10,15 +10,17 @@ long load_elf(const char* fn, int* user64)
   sysret_t ret = file_open(fn, strlen(fn)+1, O_RDONLY, 0);
   file_t* file = (file_t*)ret.result;
   if(ret.result == -1)
-    panic("couldn't open %s!", fn);
+    goto fail;
 
   char buf[2048]; // XXX
   int header_size = file_read(file, buf, sizeof(buf)).result;
-  kassert(header_size >= (int)sizeof(Elf64_Ehdr));
+  if(header_size >= (int)sizeof(Elf64_Ehdr))
+    goto fail;
 
   const Elf64_Ehdr* eh64 = (const Elf64_Ehdr*)buf;
-  kassert(eh64->e_ident[0] == '\177' && eh64->e_ident[1] == 'E' &&
-          eh64->e_ident[2] == 'L'    && eh64->e_ident[3] == 'F');
+  if(!(eh64->e_ident[0] == '\177' && eh64->e_ident[1] == 'E' &&
+       eh64->e_ident[2] == 'L'    && eh64->e_ident[3] == 'F'))
+    goto fail;
 
   #define LOAD_ELF do { \
     eh = (typeof(eh))buf; \
@@ -26,7 +28,8 @@ long load_elf(const char* fn, int* user64)
     ph = (typeof(ph))(buf+eh->e_phoff); \
     for(int i = 0; i < eh->e_phnum; i++, ph++) { \
       if(ph->p_type == SHT_PROGBITS && ph->p_memsz) { \
-        kassert(file_pread(file, (char*)(long)ph->p_vaddr, ph->p_filesz, ph->p_offset).result == ph->p_filesz); \
+        if(file_pread(file, (char*)(long)ph->p_vaddr, ph->p_filesz, ph->p_offset).result != ph->p_filesz) \
+          goto fail; \
         memset((char*)(long)ph->p_vaddr+ph->p_filesz, 0, ph->p_memsz-ph->p_filesz); \
       } \
     } \
@@ -40,18 +43,22 @@ long load_elf(const char* fn, int* user64)
     LOAD_ELF;
     entry = eh->e_entry;
   }
-  else
+  else if(eh64->e_ident[EI_CLASS] == ELFCLASS64)
   {
-    kassert(eh64->e_ident[EI_CLASS] == ELFCLASS64);
     Elf64_Ehdr* eh;
     Elf64_Phdr* ph;
     LOAD_ELF;
     entry = eh->e_entry;
   }
+  else
+    goto fail;
 
   *user64 = eh64->e_ident[EI_CLASS] == ELFCLASS64;
 
   file_decref(file);
 
   return entry;
+
+fail:
+    panic("couldn't open ELF program: %s!", fn);
 }