Changeset 9a8c188 in mainline

Timestamp:

2013-07-24T21:12:25Z (12 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.

Location:

uspace

Files:

• lib/c/generic/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -329 +329 @@
 static int open_internal(const char *abs, size_t abs_size, int lflag, int oflag)
 {
+        // FIXME: Some applications call this incorrectly.
+        if ((oflag & (O_RDONLY|O_WRONLY|O_RDWR)) == 0) {
+                oflag |= O_RDWR;
+        }
+
+        assert((((oflag & O_RDONLY) != 0) + ((oflag & O_WRONLY) != 0) + ((oflag & O_RDWR) != 0)) == 1);
+        
         async_exch_t *exch = vfs_exchange_begin();
         

uspace/srv/vfs/vfs.c

@@ -89 +89 @@
                         break;
                 case VFS_IN_OPEN2:
-                        vfs_open(callid, &call);
+                        vfs_open2(callid, &call);
                         break;
                 case VFS_IN_OPEN:

uspace/srv/vfs/vfs.h

@@ -228 +228 @@
 
 extern void vfs_walk(ipc_callid_t, ipc_call_t *);
-extern void vfs_create(ipc_callid_t, ipc_call_t *);
 extern void vfs_open2(ipc_callid_t, ipc_call_t *);
 

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);
         
         /*