Changeset 625 for trunk/kernel/syscalls/sys_close.c

Timestamp:

Apr 10, 2019, 10:09:39 AM (5 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

• trunk/kernel/syscalls/sys_close.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_close.c

@@ -35 +35 @@
 int sys_close ( uint32_t file_id )
 {
-    error_t     error;
-    xptr_t      file_xp;
+    error_t            error;
+    xptr_t             file_xp;
+    cxy_t              file_cxy;
+    vfs_file_t       * file_ptr;
+    vfs_inode_type_t   file_type;
 
         thread_t  * this    = CURRENT_THREAD;
@@ -54 +57 @@
         if( file_id >= CONFIG_PROCESS_FILE_MAX_NR )
         {
-        printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
-               __FUNCTION__ , file_id );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
+__FUNCTION__ , file_id );
+#endif
                 this->errno = EBADFD;
                 return -1;
@@ -73 +79 @@
                 return -1;
     }
+
+    // get file type
+    file_cxy  = GET_CXY( file_xp );
+    file_ptr  = GET_PTR( file_xp );
+    file_type = hal_remote_l32( XPTR( file_cxy , &file_ptr->type ) );
+
+    if( file_type == INODE_TYPE_DIR ) 
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : file descriptor %d is a directory\n",
+__FUNCTION__ , file_id );
+#endif
+                this->errno = EBADFD;
+                return -1;
+        }
 
     // call the relevant VFS function