X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fopen.c;h=748d0f7e7a173189f4573479806db6102dda570b;hb=c34752b7ccc945a70a2d9b1e505aa4a4de43163b;hp=5ea67c19c2e32c81aa5c41a5b8f8091d849f2be0;hpb=4ebe00546574e97c5316881881f7f2562deea74b;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/vfs/open.c b/KernelLand/Kernel/vfs/open.c index 5ea67c19..748d0f7e 100644 --- a/KernelLand/Kernel/vfs/open.c +++ b/KernelLand/Kernel/vfs/open.c @@ -2,6 +2,7 @@ * Acess2 VFS * - Open, Close and ChDir */ +#define SANITY 1 #define DEBUG 0 #include #include "vfs.h" @@ -17,13 +18,25 @@ // === IMPORTS === extern tVFS_Mount *gVFS_RootMount; -extern int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode); extern tVFS_Node *VFS_MemFile_Create(const char *Path); // === PROTOTYPES === - int VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode ); +void _ReferenceMount(tVFS_Mount *Mount, const char *DebugTag); +void _DereferenceMount(tVFS_Mount *Mount, const char *DebugTag); + int VFS_int_CreateHandle(tVFS_Node *Node, tVFS_Mount *Mount, int Mode); // === CODE === +void _ReferenceMount(tVFS_Mount *Mount, const char *DebugTag) +{ +// Log_Debug("VFS", "%s: inc. mntpt '%s' to %i", DebugTag, Mount->MountPoint, Mount->OpenHandleCount+1); + Mount->OpenHandleCount ++; +} +void _DereferenceMount(tVFS_Mount *Mount, const char *DebugTag) +{ +// Log_Debug("VFS", "%s: dec. mntpt '%s' to %i", DebugTag, Mount->MountPoint, Mount->OpenHandleCount-1); + ASSERT(Mount->OpenHandleCount > 0); + Mount->OpenHandleCount --; +} /** * \fn char *VFS_GetAbsPath(const char *Path) * \brief Create an absolute path from a relative one @@ -201,7 +214,7 @@ restart_parse: *TruePath = malloc( gVFS_RootMount->MountPointLen+1 ); strcpy(*TruePath, gVFS_RootMount->MountPoint); } - gVFS_RootMount->OpenHandleCount ++; + _ReferenceMount(gVFS_RootMount, "ParsePath - Fast Tree Root"); if(MountPoint) *MountPoint = gVFS_RootMount; LEAVE('p', gVFS_RootMount->RootNode); return gVFS_RootMount->RootNode; @@ -239,13 +252,19 @@ restart_parse: *MountPoint = mnt; RWLock_Release( &glVFS_MountList ); LOG("Mount %p root", mnt); + _ReferenceMount(mnt, "ParsePath - Mount Root"); LEAVE('p', mnt->RootNode); return mnt->RootNode; } #endif longestMount = mnt; } - longestMount->OpenHandleCount ++; // Increment assuimg it worked + if(!longestMount) { + Log_Panic("VFS", "VFS_ParsePath - No mount for '%s'", Path); + return NULL; + } + + _ReferenceMount(longestMount, "ParsePath"); RWLock_Release( &glVFS_MountList ); // Save to shorter variable @@ -279,6 +298,7 @@ restart_parse: // Check permissions on root of filesystem if( !VFS_CheckACL(curNode, VFS_PERM_EXECUTE) ) { LOG("Permissions failure on '%s'", Path); + errno = EPERM; goto _error; } @@ -297,7 +317,7 @@ restart_parse: } LOG("FindDir{=%p}(%p, '%s')", curNode->Type->FindDir, curNode, pathEle); // Get Child Node - tmpNode = curNode->Type->FindDir(curNode, pathEle); + tmpNode = curNode->Type->FindDir(curNode, pathEle, 0); LOG("tmpNode = %p", tmpNode); _CloseNode( curNode ); curNode = tmpNode; @@ -305,6 +325,7 @@ restart_parse: // Error Check if(!curNode) { LOG("Node '%s' not found in dir '%s'", pathEle, Path); + errno = ENOENT; goto _error; } @@ -317,11 +338,13 @@ restart_parse: if(!curNode->Type || !curNode->Type->Read) { Log_Warning("VFS", "VFS_ParsePath - Read of symlink node %p'%s' is NULL", curNode, Path); + errno = EINTERNAL; goto _error; } if(iNestedLinks > MAX_NESTED_LINKS) { Log_Notice("VFS", "VFS_ParsePath - Nested link limit exceeded"); + errno = ENOENT; goto _error; } @@ -332,9 +355,10 @@ restart_parse: int remlen = strlen(Path) - (ofs + nextSlash); if( curNode->Size + remlen > MAX_PATH_LEN ) { Log_Warning("VFS", "VFS_ParsePath - Symlinked path too long"); + errno = ENOENT; goto _error; } - curNode->Type->Read( curNode, 0, curNode->Size, path_buffer ); + curNode->Type->Read( curNode, 0, curNode->Size, path_buffer, 0 ); path_buffer[ curNode->Size ] = '\0'; LOG("path_buffer = '%s'", path_buffer); strcat(path_buffer, Path + ofs+nextSlash); @@ -347,7 +371,7 @@ restart_parse: // EVIL: Goto :) LOG("Symlink -> '%s', restart", Path); - mnt->OpenHandleCount --; // Not in this mountpoint + _DereferenceMount(mnt, "ParsePath - sym"); goto restart_parse; } @@ -355,6 +379,7 @@ restart_parse: if( !(curNode->Flags & VFS_FFLAG_DIRECTORY) ) { Log_Warning("VFS", "VFS_ParsePath - Path segment is not a directory"); + errno = ENOTDIR; goto _error; } @@ -366,6 +391,7 @@ restart_parse: // Check if allocation succeeded if(!tmp) { Log_Warning("VFS", "VFS_ParsePath - Unable to reallocate true path buffer"); + errno = ENOMEM; goto _error; } *TruePath = tmp; @@ -382,16 +408,18 @@ restart_parse: // Check final finddir call if( !curNode->Type || !curNode->Type->FindDir ) { Log_Warning("VFS", "VFS_ParsePath - FindDir doesn't exist for element of '%s'", Path); + errno = ENOENT; goto _error; } // Get last node LOG("FindDir(%p, '%s')", curNode, &Path[ofs]); - tmpNode = curNode->Type->FindDir(curNode, &Path[ofs]); + tmpNode = curNode->Type->FindDir(curNode, &Path[ofs], 0); LOG("tmpNode = %p", tmpNode); // Check if file was found if(!tmpNode) { LOG("Node '%s' not found in dir '%.*s'", &Path[ofs], ofs, Path); + errno = ENOENT; goto _error; } _CloseNode( curNode ); @@ -403,6 +431,7 @@ restart_parse: // Check if allocation succeeded if(!tmp) { Log_Warning("VFS", "VFS_ParsePath - Unable to reallocate true path buffer"); + errno = ENOMEM; goto _error; } *TruePath = tmp; @@ -430,8 +459,7 @@ _error: *TruePath = NULL; } // Open failed, so decrement the open handle count - mnt->OpenHandleCount --; - + _DereferenceMount(mnt, "ParsePath - error"); LEAVE('n'); return NULL; } @@ -459,6 +487,13 @@ int VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode ) errno = EACCES; LEAVE_RET('i', -1); } + + if( MM_GetPhysAddr(Node->Type) == 0 ) { + Log_Error("VFS", "Node %p from mount '%s' (%s) has a bad type (%p)", + Node, Mount->MountPoint, Mount->Filesystem->Name, Node->Type); + errno = EINTERNAL; + LEAVE_RET('i', -1); + } i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), Node, Mode ); if( i < 0 ) { @@ -521,28 +556,44 @@ int VFS_OpenEx(const char *Path, Uint Flags, Uint Mode) LEAVE_RET('i', -1); } - // TODO: Check ACLs on the parent + // Check ACLs on the parent if( !VFS_CheckACL(pnode, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) { - _CloseNode(pnode); - pmnt->OpenHandleCount --; - free(absPath); - LEAVE('i', -1); - return -1; + errno = EACCES; + goto _pnode_err; } // Check that there's a MkNod method if( !pnode->Type || !pnode->Type->MkNod ) { Log_Warning("VFS", "VFS_Open - Directory has no MkNod method"); errno = EINVAL; - LEAVE_RET('i', -1); + goto _pnode_err; } node = pnode->Type->MkNod(pnode, file, new_flags); + if( !node ) { + LOG("Cannot create node '%s' in '%s'", file, absPath); + errno = ENOENT; + goto _pnode_err; + } + // Set mountpoint (and increment open handle count) + mnt = pmnt; + _ReferenceMount(mnt, "Open - create"); // Fall through on error check _CloseNode(pnode); - pmnt->OpenHandleCount --; + _DereferenceMount(pmnt, "Open - create"); + goto _pnode_ok; + + _pnode_err: + if( pnode ) { + _CloseNode(pnode); + _DereferenceMount(pmnt, "Open - create,fail"); + free(absPath); + } + LEAVE('i', -1); + return -1; } + _pnode_ok: // Free generated path free(absPath); @@ -552,7 +603,7 @@ int VFS_OpenEx(const char *Path, Uint Flags, Uint Mode) { LOG("Cannot find node"); errno = ENOENT; - LEAVE_RET('i', -1); + goto _error; } // Check for symlinks @@ -561,26 +612,35 @@ int VFS_OpenEx(const char *Path, Uint Flags, Uint Mode) char tmppath[node->Size+1]; if( node->Size > MAX_PATH_LEN ) { Log_Warning("VFS", "VFS_Open - Symlink is too long (%i)", node->Size); - LEAVE_RET('i', -1); + goto _error; } if( !node->Type || !node->Type->Read ) { Log_Warning("VFS", "VFS_Open - No read method on symlink"); - LEAVE_RET('i', -1); + goto _error; } // Read symlink's path - node->Type->Read( node, 0, node->Size, tmppath ); + node->Type->Read( node, 0, node->Size, tmppath, 0 ); tmppath[ node->Size ] = '\0'; _CloseNode( node ); + _DereferenceMount(mnt, "Open - symlink"); // Open the target node = VFS_ParsePath(tmppath, NULL, &mnt); if(!node) { LOG("Cannot find symlink target node (%s)", tmppath); errno = ENOENT; - LEAVE_RET('i', -1); + goto _error; } } - LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Flags)); + int ret = VFS_int_CreateHandle(node, mnt, Flags); + LEAVE_RET('x', ret); +_error: + if( node ) + { + _DereferenceMount(mnt, "Open - error"); + _CloseNode(node); + } + LEAVE_RET('i', -1); } @@ -617,14 +677,14 @@ int VFS_OpenChild(int FD, const char *Name, Uint Mode) } // Find Child - node = h->Node->Type->FindDir(h->Node, Name); + node = h->Node->Type->FindDir(h->Node, Name, 0); if(!node) { errno = ENOENT; LEAVE_RET('i', -1); } // Increment open handle count, no problems with the mount going away as `h` is already open on it - h->Mount->OpenHandleCount ++; + _ReferenceMount(h->Mount, "OpenChild"); LEAVE_RET('x', VFS_int_CreateHandle(node, h->Mount, Mode)); } @@ -662,6 +722,30 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode) LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode)); } +int VFS_Reopen(int FD, const char *Path, int Flags) +{ + tVFS_Handle *h = VFS_GetHandle(FD); + if(!h) { + errno = EBADF; + return -1; + } + + int newf = VFS_Open(Path, Flags); + if( newf == -1 ) { + return -1; + } + + _CloseNode(h->Node); + _DereferenceMount(h->Mount, "Reopen"); + memcpy(h, VFS_GetHandle(newf), sizeof(*h)); + _ReferenceNode(h->Node); + _ReferenceMount(h->Mount, "Reopen"); + + VFS_Close(newf); + + return FD; +} + /** * \fn void VFS_Close(int FD) * \brief Closes an open file handle @@ -676,7 +760,12 @@ void VFS_Close(int FD) Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x", FD); return; } - + + if( h->Node == NULL ) { + Log_Warning("VFS", "Non-open handle passed to VFS_Close, 0x%x", FD); + return ; + } + #if VALIDATE_VFS_FUNCTIPONS if(h->Node->Close && !MM_GetPhysAddr(h->Node->Close)) { Log_Warning("VFS", "Node %p's ->Close method is invalid (%p)", @@ -685,14 +774,51 @@ void VFS_Close(int FD) } #endif + LOG("Handle %x", FD); _CloseNode(h->Node); - if( h->Mount ) - h->Mount->OpenHandleCount --; + if( h->Mount ) { + _DereferenceMount(h->Mount, "Close"); + } h->Node = NULL; } +int VFS_DuplicateFD(int SrcFD, int DstFD) +{ + int isUser = !(SrcFD & VFS_KERNEL_FLAG); + tVFS_Handle *src = VFS_GetHandle(SrcFD); + if( !src ) return -1; + if( DstFD == -1 ) { + DstFD = VFS_AllocHandle(isUser, src->Node, src->Mode); + } + else { + // Can't overwrite + if( VFS_GetHandle(DstFD) ) + return -1; + VFS_SetHandle(DstFD, src->Node, src->Mode); + } + _ReferenceMount(src->Mount, "DuplicateFD"); + _ReferenceNode(src->Node); + memcpy(VFS_GetHandle(DstFD), src, sizeof(tVFS_Handle)); + return DstFD; +} + +/* + * Update flags on a FD + */ +int VFS_SetFDFlags(int FD, int Mask, int Value) +{ + tVFS_Handle *h = VFS_GetHandle(FD); + if(!FD) return -1; + int ret = h->Mode; + + Value &= Mask; + h->Mode &= ~Mask; + h->Mode |= Value; + return ret; +} + /** * \brief Change current working directory */