Merge pull request ish-app#649 from thunderkeys/fix_lock_flags

Fix lockfile flag checks
mehfooz09 · Feb 26, 2020 · 47747dc · 47747dc
2 parents 47078b8 + fb7826f
commit 47747dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fs/lock.c b/fs/lock.c
@@ -212,9 +212,10 @@ int fcntl_getlk(struct fd *fd, struct flock_ *flock) {
 int fcntl_setlk(struct fd *fd, struct flock_ *flock, bool blocking) {
     if (flock->type != F_RDLCK_ && flock->type != F_WRLCK_ && flock->type != F_UNLCK_)
         return _EINVAL;
-    if (flock->type == F_RDLCK_ && !(fd_getflags(fd) & (O_RDONLY_|O_RDWR_)))
+    int fd_mode = fd_getflags(fd) & O_ACCMODE_;
+    if (flock->type == F_RDLCK_ && fd_mode == O_WRONLY_)
         return _EBADF;
-    if (flock->type == F_WRLCK_ && !(fd_getflags(fd) & (O_WRONLY_|O_RDWR_)))
+    if (flock->type == F_WRLCK_ && fd_mode == O_RDONLY_)
         return _EBADF;
 
     struct inode_data *inode = fd->inode;

diff --git a/kernel/fs.h b/kernel/fs.h
@@ -113,6 +113,7 @@ int mount_remove(struct mount *mount);
 extern struct list mounts;
 
 // open flags
+#define O_ACCMODE_ 3
 #define O_RDONLY_ 0
 #define O_WRONLY_ (1 << 0)
 #define O_RDWR_ (1 << 1)