Changeset 9a8c188 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2013-07-24T21:12:25Z (11 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

1393bbb

Parents:

0b18364

Message:

Fix a bug and work around applications that call open() incorrectly.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -767 +767 @@
         }
         
+        if ((((oflag & O_RDONLY) != 0) + ((oflag & O_WRONLY) != 0) + ((oflag & O_RDWR) != 0)) != 1) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+        
         if (oflag & O_CREAT)
                 lflag |= L_CREATE;
@@ -840 +845 @@
         vfs_file_t *file = vfs_file_get(fd);
         
-        /* There is a potential race with another fibril of a malicious client. */
-        if (!file) {
-                vfs_node_put(node);
-                async_answer_0(rid, EBUSY);
-                return;
-        }
+        /* FIXME: There is a potential race with another fibril of a malicious client. */
+        assert(file);
         
         file->node = node;
@@ -856 +857 @@
         if (oflag & O_APPEND)
                 file->append = true;
+        assert(file->open_read || file->open_write);
         
         /*