Changeset 421 for trunk/kernel/syscalls/sys_read.c

Timestamp:

Jan 29, 2018, 5:40:34 PM (5 years ago)

Author:

alain

Message:

Introduce sys_fg() , sys_display() , sys_wait() syscalls.

File:

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

trunk/kernel/syscalls/sys_read.c

@@ -98 +98 @@
 
     // enable IRQs
-    // hal_enable_irq( &save_sr );
+    hal_enable_irq( &save_sr );
 
     // get extended pointer on remote file descriptor
@@ -129 +129 @@
 
     // action depend on file type
-    if( type == INODE_TYPE_FILE )      // transfer count bytes from file mapper 
-    {
+    if( type == INODE_TYPE_FILE )      // check file readable & read from mapper 
+    {
+        // check file readable
+        uint32_t attr = hal_remote_lw( XPTR( file_cxy , &file_ptr->attr ) );
+        if( (attr & FD_ATTR_READ_ENABLE) == 0 )
+            {
+            printk("\n[ERROR] in %s : file %d not readable in process %x\n",
+            __FUNCTION__ , file_id , process->pid );
+                    this->errno = EBADFD;
+                    return -1;
+            }
+
+        // move count bytes from mapper
         nbytes = vfs_user_move( true,               // from mapper to buffer
                                 file_xp,
@@ -136 +147 @@
                                 count );
     }
-    else if( type == INODE_TYPE_DEV )  // transfer count bytes from device
-    {
+    else if( type == INODE_TYPE_DEV )  // check ownership & read from from device
+    {
+        // move count bytes from device
         nbytes = devfs_user_move( true,             // from device to buffer
                                   file_xp,
                                   vaddr,
                                   count );
+
+        // check ownership
+        xptr_t    chdev_xp  = chdev_from_file( file_xp );
+        cxy_t     chdev_cxy = GET_CXY( chdev_xp );
+        chdev_t * chdev_ptr = (chdev_t *)GET_PTR( chdev_xp );
+        xptr_t    owner_xp  = hal_remote_lwd( XPTR( chdev_cxy , &chdev_ptr->ext.txt.owner_xp ) );
+
+        if( XPTR( local_cxy , process ) != owner_xp )
+        {
+            printk("\n[ERROR] in %s : process %x not in foreground for TXT%d\n",
+            __FUNCTION__, process->pid, hal_remote_lw( XPTR(chdev_cxy,&chdev_ptr->channel) ) );
+                    this->errno = EBADFD;
+                    return -1;
+        }
     }
     else
     {
         nbytes = 0;
-        panic("file type %d non supported yet", type );
+        assert( false , __FUNCTION__ , "file type %d non supported yet\n", type );
     }
 
@@ -158 +184 @@
 
     // restore IRQs
-    // hal_restore_irq( save_sr );
+    hal_restore_irq( save_sr );
 
     hal_fence();
@@ -171 +197 @@
 #endif
 
-#if CONFIG_READ_DEBUG 
+#if (CONFIG_READ_DEBUG & 0x1) 
 exit_sys_read = (uint32_t)tm_end;