i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/fs: Relocate and consolidate open mode checks.

Browse Source 
* get_new_fd is actually too late for the O_TRUNC one: we will
   have already called the vnode open() hook by then. So, we
   need to do that in open_vnode.

 * Move checks to a new static helper method, and invoke it
   in all relevant places.

 * Delete now-redundant O_NOFOLLOW checks.
This commit is contained in:
Augustin Cavalier
2026-01-08 16:31:21 -05:00
parent 7d234f26de
commit f1f209415b
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+26 -18
View File
@@ -2849,11 +2849,6 @@ get_new_fd(struct fd_ops* ops, struct fs_mount* mount, struct vnode* vnode,
&& (ops == &sFileOps || ops == &sDirectoryOps))
return B_BUSY;
if ((openMode & O_RDWR) != 0 && (openMode & O_WRONLY) != 0)
return B_BAD_VALUE;
if ((openMode & O_RWMASK) == O_RDONLY && (openMode & O_TRUNC) != 0)
return B_NOT_ALLOWED;
descriptor = alloc_fd();
if (!descriptor)
return B_NO_MEMORY;
@@ -5409,6 +5404,21 @@ vfs_init(kernel_args* args)
// #pragma mark - fd_ops implementations
static status_t
check_open_mode(struct vnode* vnode, int openMode)
{
if ((openMode & O_RDWR) != 0 && (openMode & O_WRONLY) != 0)
return B_BAD_VALUE;
if ((openMode & O_RWMASK) == O_RDONLY && (openMode & O_TRUNC) != 0)
return B_NOT_ALLOWED;
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
return B_OK;
}
/*!
Calls fs_open() on the given vnode and returns a new
file descriptor for it
@@ -5416,8 +5426,12 @@ vfs_init(kernel_args* args)
static int
open_vnode(struct vnode* vnode, int openMode, bool kernel)
{
status_t status = check_open_mode(vnode, openMode);
if (status != B_OK)
return status;
void* cookie;
status_t status = FS_CALL(vnode, open, openMode, &cookie);
status = FS_CALL(vnode, open, openMode, &cookie);
if (status != B_OK)
return status;
@@ -5498,8 +5512,6 @@ create_vnode(struct vnode* directory, const char* name, int openMode,
}
if (!create) {
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
if (S_ISDIR(vnode->Type()))
return B_IS_A_DIRECTORY;
@@ -5668,9 +5680,6 @@ file_open_entry_ref(dev_t mountID, ino_t directoryID, const char* name,
if (status != B_OK)
return status;
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
int newFD = open_vnode(vnode.Get(), openMode, kernel);
if (newFD >= 0) {
cache_node_opened(vnode.Get(), vnode->cache, mountID,
@@ -5700,9 +5709,6 @@ file_open(int fd, char* path, int openMode, bool kernel)
if (status != B_OK)
return status;
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
// open the vnode
int newFD = open_vnode(vnode.Get(), openMode, kernel);
if (newFD >= 0) {
@@ -6904,8 +6910,9 @@ attr_create(int fd, char* path, const char* name, uint32 type,
if (status != B_OK)
return status;
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
status = check_open_mode(vnode.Get(), openMode);
if (status != B_OK)
return status;
if (!HAS_FS_CALL(vnode, create_attr))
return B_READ_ONLY_DEVICE;
@@ -6945,8 +6952,9 @@ attr_open(int fd, char* path, const char* name, int openMode, bool kernel)
if (status != B_OK)
return status;
if ((openMode & O_NOFOLLOW) != 0 && S_ISLNK(vnode->Type()))
return B_LINK_LIMIT;
status = check_open_mode(vnode.Get(), openMode);
if (status != B_OK)
return status;
if (!HAS_FS_CALL(vnode, open_attr))
return B_UNSUPPORTED;