Changeset 670 for trunk/kernel/syscalls/sys_open.c

Timestamp:

Nov 19, 2020, 11:45:52 PM (4 years ago)

Author:

alain

Message:

1) Introduce up to 4 command lines arguments in the KSH "load" command.
These arguments are transfered to the user process through the
argc/argv mechanism, using the user space "args" vseg.

2) Introduce the named and anonymous "pipes", for inter-process communication
through the pipe() and mkfifo() syscalls.

3) Introduce the "chat" application to validate the two above mechanisms.

4) Improve printk() and assert() fonctions in printk.c.

File:

• trunk/kernel/syscalls/sys_open.c (modified) (8 diffs)

trunk/kernel/syscalls/sys_open.c

@@ -39 +39 @@
                uint32_t   mode )
 {
+    vseg_t       * vseg; 
     error_t        error;
     xptr_t         file_xp;                 // extended pointer on vfs_file_t
     uint32_t       file_id;                 // file descriptor index
-    xptr_t         root_inode_xp;           // extended pointer on path root inode
+    xptr_t         root_inode_xp;           // extended pointer on root inode
 
     char           kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
@@ -49 +50 @@
     process_t    * process  = this->process;
 
-#if (DEBUG_SYS_OPEN || CONFIG_INSTRUMENTATION_SYSCALLS)
+#if DEBUG_SYS_OPEN || DEBUG_SYSCALLS_ERROR || CONFIG_INSTRUMENTATION_SYSCALLS
 uint64_t     tm_start = hal_get_cycles();
 #endif
@@ -58 +59 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : file descriptor array full for process %x\n",
-__FUNCTION__ , process->pid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : file descriptor array full for thread[%x,%x]\n",
+__FUNCTION__ , process->pid , this->trdid );
 #endif
         this->errno = ENFILE;
         return -1;
     }
+
+    // check pathname in user space
+    if( vmm_get_vseg( process, (intptr_t)pathname , &vseg ) )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : user buffer unmapped %x for thread[%x,%x]\n",
+__FUNCTION__ , (intptr_t)pathname , process->pid, this->trdid );
+#endif
+                this->errno = EINVAL;
+        return -1;
+        }
 
     // check pathname length
@@ -70 +85 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : pathname too long\n", __FUNCTION__ );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : pathname too long for thread[%x,%x]\n",
+__FUNCTION__ , process->pid , this->trdid );
 #endif
         this->errno = ENFILE;
@@ -77 +94 @@
 
     // copy pathname in kernel space
-    hal_strcpy_from_uspace( XPTR( local_cxy , kbuf ) , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
-
+    hal_strcpy_from_uspace( XPTR( local_cxy , kbuf ),
+                            pathname,
+                            CONFIG_VFS_MAX_PATH_LENGTH );
 #if DEBUG_SYS_OPEN
 if( DEBUG_SYS_OPEN < tm_start )
@@ -86 +104 @@
  
     // get cluster and local pointer on reference process
-    xptr_t      ref_xp  = process->ref_xp;
-    process_t * ref_ptr = (process_t *)GET_PTR( ref_xp );
-    cxy_t       ref_cxy = GET_CXY( ref_xp );
+    xptr_t      owner_xp  = process->owner_xp;
+    process_t * owner_ptr = GET_PTR( owner_xp );
+    cxy_t       owner_cxy = GET_CXY( owner_xp );
 
-    // compute root inode for path 
-    if( kbuf[0] == '/' )                        // absolute path
+    // get extended pointer on root inode in path
+    if( kbuf[0] == '/' )                            // absolute path
     {
         // use extended pointer on VFS root inode
         root_inode_xp = process->vfs_root_xp;
     }
-    else                                        // relative path
+    else                                            // relative path
     {
         // use extended pointer on CWD inode
-        root_inode_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->cwd_xp ) );
+        root_inode_xp = hal_remote_l64( XPTR( owner_cxy , &owner_ptr->cwd_xp ) );
     }
 
@@ -105 +123 @@
     error = vfs_open( root_inode_xp,
                       kbuf,
-                      ref_xp,
+                      owner_xp,
                       flags,
                       mode,
@@ -113 +131 @@
     if( error )
     {
-        printk("\n[ERROR] in %s : cannot create file descriptor for %s\n",
-        __FUNCTION__ , kbuf );
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] cannot create file descriptor for %s\n",
+__FUNCTION__ , process->pid , this->trdid , kbuf );
+#endif
         this->errno = ENFILE;
         return -1;