Changeset 38aaf005 in mainline

Timestamp:

2017-03-18T15:36:00Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ad67aa1

Parents:

0b97336

Message:

Callers of open() must use exactly one of O_RDONLY, O_WRONLY and O_RDWR

Location:

uspace

Files:

• app/bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• app/tester/mm/pager1.c (modified) (1 diff)
• app/tester/vfs/vfs1.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -386 +386 @@
         }
 
-        if (-1 == (fd2 = open(dest, O_CREAT))) {
+        if (-1 == (fd2 = open(dest, O_WRONLY | O_CREAT))) {
                 printf("Unable to open destination file %s\n", dest);
                 close(fd1);

uspace/app/tester/mm/pager1.c

@@ -48 +48 @@
         TPRINTF("Creating temporary file...\n");
 
-        fd = open(TEST_FILE, O_CREAT);
+        fd = open(TEST_FILE, O_RDWR | O_CREAT);
         if (fd < 0)
                 return NULL;

uspace/app/tester/vfs/vfs1.c

@@ -76 +76 @@
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0 = open(TEST_FILE, O_CREAT);
+        int fd0 = open(TEST_FILE, O_RDWR | O_CREAT);
         if (fd0 < 0)
                 return "open() failed";

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

@@ -388 +388 @@
 int open(const char *path, 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);
+        if (((oflag & (O_RDONLY | O_WRONLY | O_RDWR)) == 0) ||
+            ((oflag & (O_RDONLY | O_WRONLY)) == (O_RDONLY | O_WRONLY)) ||
+            ((oflag & (O_RDONLY | O_RDWR)) == (O_RDONLY | O_RDWR)) ||
+            ((oflag & (O_WRONLY | O_RDWR)) == (O_WRONLY | O_RDWR))) {
+                errno = EINVAL;
+                return -1;
+        }
         
         int fd = vfs_lookup(path, walk_flags(oflag) | WALK_REGULAR);