Changeset 443 for trunk/kernel/syscalls/sys_write.c

Timestamp:

May 16, 2018, 4:15:22 PM (6 years ago)

Author:

alain

Message:

Fix few bugs whike debugging the sort multi-thread application.

File:

• trunk/kernel/syscalls/sys_write.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_write.c

@@ -103 +103 @@
     }
 
-    // enable IRQs
-    hal_enable_irq( &save_sr );
-
     // get extended pointer on remote file descriptor
     file_xp = process_fd_get_xptr( process , file_id );
@@ -128 +125 @@
     vfs_inode_type_t type = hal_remote_lw( XPTR( file_cxy , &file_ptr->type ) );
 
-    // action depend on file type
+    // enable IRQs
+    hal_enable_irq( &save_sr );
+
+   // action depend on file type
     if( type == INODE_TYPE_FILE )  // check file writable & write to mapper 
     {
@@ -152 +152 @@
     else if( type == INODE_TYPE_DEV )  // check ownership & write to device
     {
+        // check user buffer size for TXT_TX
+        if( (type == INODE_TYPE_DEV) && (count >= CONFIG_TXT_KBUF_SIZE) )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : user buffer size %x too large / thread %x / process %x\n",
+__FUNCTION__ , count, this->trdid, process->pid );
+#endif
+                    this->errno = EINVAL;
+                    return -1;
+        }
+
         // move count bytes to device
         nbytes = devfs_user_move( false,             // from buffer to device
@@ -158 +170 @@
                                  count );
     }
-    else
+    else  // not FILE and not DEV
     {
         nbytes = 0;
@@ -192 +204 @@
 exit_sys_write = (uint32_t)tm_end;
 
-printk("\n@@@@@@@@@@@@ timing to write\n"
+printk("\n***** timing to write a string *****\n"
 " - enter_sys_write          = %d / delta %d\n"
 " - enter_devfs_write        = %d / delta %d\n"