Changeset 625

Timestamp:

Jul 17, 2015, 4:34:54 PM (9 years ago)

Author:

guerin

Message:

fat32: check for fd allocation in _fat_close()

Could cause a negative refcount on an invalid inode.

File:

• soft/giet_vm/giet_fat32/fat32.c (modified) (4 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -2955 +2955 @@
 //  -1  : "FAT not initialised"
 //  -2  : "Illegal file descriptor"
-//  -3  : "Cannot update DATA region for closed file"
-//  -4  : "Cannot release memory"
+//  -3  : "File not open"
+//  -4  : "Cannot update DATA regions"
+//  -5  : "Cannot release memory"
 /////////////////////////////////////////////////////////////////////////////////
 int _fat_close( unsigned int fd_id )
@@ -2975 +2976 @@
     // takes lock
     _spin_lock_acquire( &_fat.fat_lock );
+
+    if( _fat.fd[fd_id].allocated == 0 )
+    {
+        _spin_lock_release( &_fat.fat_lock );
+        _printf("\n[FAT ERROR] in _fat_close() : file not open\n");
+        return -3;
+    }
 
     // get the inode pointer 
@@ -2999 +3007 @@
             _printf("\n[FAT ERROR] in _fat_close() : cannot write dirty clusters "
                     "for file <%s>\n", inode->name );
-            return -3;
+            return -4;
         }
 
@@ -3083 +3091 @@
     if ( _fat.fd[fd_id].allocated == 0 )
     {
-        _printf("\n[FAT ERROR] in _fat_file_info() : file <%s> not open\n",
-                _fat.fd[fd_id].inode->name );
+        _printf("\n[FAT ERROR] in _fat_file_info() : file not open\n");
         return -3;
     }