Changeset 204 for trunk/kernel/libk/elf.c

Timestamp:

Jul 17, 2017, 8:42:59 AM (7 years ago)

Author:

alain

Message:

Bug fix in kernel_init
-This line, and those below, will be ignored--

M params.mk
M kernel_config.h
M Makefile
M hdd/virt_hdd.dmg
M tools/bootloader_tsar/boot.c
M kernel/libk/bits.h
M kernel/libk/elf.c
M kernel/libk/xhtab.c
M kernel/libk/elf.h
M kernel/libk/xhtab.h
M kernel/devices/dev_pic.c
M kernel/mm/vmm.c
M kernel/mm/mapper.c
M kernel/mm/mapper.h
M kernel/vfs/devfs.h
M kernel/vfs/vfs.c
M kernel/vfs/vfs.h
M kernel/vfs/devfs.c
M kernel/kern/chdev.h
M kernel/kern/kernel_init.c
M kernel/kern/process.c
M kernel/kern/process.h
M hal/tsar_mips32/core/hal_remote.c
M hal/tsar_mips32/drivers/soclib_pic.c

File:

• trunk/kernel/libk/elf.c (modified) (8 diffs)

trunk/kernel/libk/elf.c

@@ -75 +75 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 // This function loads the .elf header in the buffer allocated by the caller.
+///////////////////////////////////////////////////////////////////////////////////////
 // @ file   : extended pointer on the remote file descriptor.
 // @ buffer : pointer on buffer allocated by the caller.
 // @ size   : number of bytes to read.
 ///////////////////////////////////////////////////////////////////////////////////////
-static error_t elf_header_read( xptr_t   file_xp,
+static error_t elf_header_load( xptr_t   file_xp,
                                 void   * buffer,
                                 uint32_t size )
@@ -114 +115 @@
         }
         return 0;
-}
+
+} // end elf_header_load()
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // This function registers in the process VMM the CODE and DATA segments.
+///////////////////////////////////////////////////////////////////////////////////////
 // @ file      : extended pointer on the remote file descriptor.
 // @ segs_base : local pointer on buffer containing the segments descriptors array
@@ -212 +215 @@
 
         return 0;
-}
+
+} // end elf_segments_load()
 
 ///////////////////////////////////////////////
@@ -218 +222 @@
                           process_t * process)
 {
-        char         path_copy[CONFIG_VFS_MAX_PATH_LENGTH];
         kmem_req_t   req;              // kmem request for program header
-        uint32_t     length;           // actual path length
         Elf32_Ehdr   header;           // local buffer for .elf header
         void       * segs_base;        // pointer on buffer for segment descriptors array
@@ -229 +231 @@
         error_t      error;
 
-        // get path length from user space
-        length = hal_strlen_from_uspace( pathname );
-
-        if( length >= CONFIG_VFS_MAX_PATH_LENGTH )
-        {
-                printk("\n[ERROR] in %s : pathname length too long\n", __FUNCTION__ );
-                return -1;
-        }
-
-        // make a local copy for pathname
-        hal_copy_from_uspace( path_copy , pathname , length+1 );
+    elf_dmsg("\n[INFO] %s : enter for %s\n", __FUNCTION__ , pathname );
+
+    // avoid GCC warning
+        file_xp = XPTR_NULL;  
+        file_id = -1;
 
         // open file
-        file_xp = XPTR_NULL;  // avoid GCC warning
-        file_id = -1;
-
         error = vfs_open( process->vfs_cwd_xp,
-                          path_copy,
+                          pathname,
                           O_RDONLY,
                           0,
@@ -253 +246 @@
         if( error )
         {
-                printk("\n[ERROR] in %s : failed to open executable file %s\n",
-                       __FUNCTION__ , path_copy );
-                return -1;
-        }
+                printk("\n[ERROR] in %s : failed to open file %s\n", __FUNCTION__ , pathname );
+                return -1;
+        }
+
+    elf_dmsg("\n[INFO] %s : file %s open\n", __FUNCTION__ , pathname );
 
         // load header in local buffer
-        error = elf_header_read( file_xp ,
+        error = elf_header_load( file_xp ,
                                  &header,
                                  sizeof(Elf32_Ehdr) );
         if( error )
         {
-                vfs_close( file_xp , file_id );
-                return -1;
-        }
-
-        elf_dmsg("\n[INFO] %s loaded elf header for %s\n", __FUNCTION__ , path_copy );
+                printk("\n[ERROR] in %s : cannot get header file %s\n", __FUNCTION__ , pathname );
+                vfs_close( file_xp , file_id );
+                return -1;
+        }
+
+        elf_dmsg("\n[INFO] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
 
         if( header.e_phnum == 0 )
@@ -320 +315 @@
         }
 
-        elf_dmsg("\n[INFO] %s loaded segments descriptors for %s \n", __FUNCTION__ , path_copy );
+        elf_dmsg("\n[INFO] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
 
         // register loadable segments in process VMM
@@ -346 +341 @@
 
         elf_dmsg("\n[INFO] %s successfully completed / entry point = %x for %s]\n",
-                 __FUNCTION__, (uint32_t) header.e_entry , path_copy );
+                 __FUNCTION__, (uint32_t) header.e_entry , pathname );
 
         return 0;
-}
-
+
+}  // end elf_load_process()
+