Changeset 705 for soft

Timestamp:

Aug 24, 2015, 5:08:30 PM (9 years ago)

Author:

guerin

Message:

kernel: fix error handling in _load_writable_segments()

_fat_read() and _fat_lseek() return positive values on success.

File:

• soft/giet_vm/giet_kernel/ctx_handler.c (modified) (3 diffs)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -127 +127 @@
 
     // load Elf-Header into buffer from .elf file
-    if ( _fat_lseek( fd, 0, SEEK_SET ) ) return 1; 
-    if ( _fat_read( fd, buf, 4096 ) ) return 1;
+    if ( _fat_lseek( fd, 0, SEEK_SET ) < 0 ) return 1;
+    if ( _fat_read( fd, buf, 4096 ) < 0 ) return 1;
 
 #if GIET_DEBUG_SWITCH
@@ -141 +141 @@
     unsigned int nsegments      = elf_header_ptr->e_phnum;
 
-    // load Program-Header-Table from .elf file 
-    if ( _fat_lseek( fd, offset, SEEK_SET ) ) return 1;
-    if ( _fat_read( fd, buf, 4096 ) ) return 1;
+    // load Program-Header-Table from .elf file
+    if ( _fat_lseek( fd, offset, SEEK_SET ) < 0 ) return 1;
+    if ( _fat_read( fd, buf, 4096 ) < 0 ) return 1;
 
 #if GIET_DEBUG_SWITCH
@@ -167 +167 @@
 
             // load the segment
-            if ( _fat_lseek( fd, seg_offset, SEEK_SET ) ) return 1;
-            if ( _fat_read( fd, (void*)seg_vaddr, seg_size ) ) return 1;
+            if ( _fat_lseek( fd, seg_offset, SEEK_SET ) < 0 ) return 1;
+            if ( _fat_read( fd, (void*)seg_vaddr, seg_size ) < 0 ) return 1;
 
 #if GIET_DEBUG_SWITCH