Changeset 6639ae1 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2011-04-07T12:04:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3f56c90, b62dc100

Parents:

b910455

git-author:

Jiri Zarevucky <> (2011-04-07 12:04:43)

git-committer:

Jakub Jermar <jakub@…> (2011-04-07 12:04:43)

Message:

Fix NULL dereference when vfs_file_get() is called with invalid file descriptor.
(Thanks to Jiri Zarevucky.)

File:

• uspace/srv/vfs/vfs_file.c (modified) (1 diff)

uspace/srv/vfs/vfs_file.c

@@ -258 +258 @@
         if ((fd >= 0) && (fd < MAX_OPEN_FILES)) {
                 vfs_file_t *file = FILES[fd];
-                vfs_file_addref(file);
-                fibril_mutex_unlock(&VFS_DATA->lock);
-                return file;
+                if (file != NULL) {
+                        vfs_file_addref(file);
+                        fibril_mutex_unlock(&VFS_DATA->lock);
+                        return file;
+                }
         }
         fibril_mutex_unlock(&VFS_DATA->lock);