Changeset 670 for trunk/kernel/syscalls/sys_opendir.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_opendir.c (modified) (9 diffs)

trunk/kernel/syscalls/sys_opendir.c

@@ -2 +2 @@
  * sys_opendir.c - Open an user accessible VFS directory.
  * 
- * Author        Alain Greiner (2016,2017,2018,2019)
+ * Author        Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -54 +54 @@
         process_t    * process = this->process;   // client process
 
-#if (DEBUG_SYS_OPENDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+#if DEBUG_SYS_OPENDIR || DEBUG_SYSCALLS_ERROR || CONFIG_INSTRUMENTATION_SYSCALLS
 uint64_t     tm_start = hal_get_cycles();
 #endif
@@ -65 +65 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : DIR buffer %x unmapped\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / DIR buffer %x unmapped\n",
 __FUNCTION__ , process->pid , this->trdid, dirp );
 #endif
@@ -72 +73 @@
         }       
 
+    // check pathname in user space
+    error = vmm_get_vseg( process , (intptr_t)pathname, &vseg );
+
+        if( error )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / pathname %x unmapped\n",
+__FUNCTION__ , process->pid , this->trdid, pathname );
+#endif
+                this->errno = EINVAL;
+                return -1;
+        }       
     // check pathname length
     if( hal_strlen_from_uspace( pathname ) >= CONFIG_VFS_MAX_PATH_LENGTH )
@@ -77 +92 @@
 
 #if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
 printk("\n[ERROR] in %s / thread[%x,%x] : pathname too long\n",
  __FUNCTION__ , process->pid , this->trdid );
@@ -90 +106 @@
 
 #if DEBUG_SYS_OPENDIR
-if( DEBUG_SYS_OPENDIR < tm_start )
+if( DEBUG_SYS_OPENDIR < (uint32_t)tm_start )
 printk("\n[%s] thread[%x,%x] enter for directory <%s> / cycle %d\n",
 __FUNCTION__, process->pid, this->trdid, kbuf, (uint32_t)tm_start );
@@ -122 +138 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : cannot found directory <%s>\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / cannot found directory <%s>\n",
 __FUNCTION__ , process->pid , this->trdid , kbuf );
 #endif
@@ -134 +151 @@
     inode_type = hal_remote_l32( XPTR( inode_cxy , &inode_ptr->type ) );
 
-    if( inode_type != INODE_TYPE_DIR )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : cannot found directory <%s>\n",
+    if( inode_type != FILE_TYPE_DIR )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / <%s> is not a directory\n",
 __FUNCTION__ , process->pid , this->trdid , kbuf );
 #endif
@@ -165 +183 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : cannot create user_dir for <%s>\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / cannot create user_dir for <%s>\n",
 __FUNCTION__ , process->pid , this->trdid , kbuf );
 #endif