Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linux_newfstatat function to correctly handle absolute paths

Browse Source
This commit is contained in:
EnderIce2 2024-03-31 17:14:58 +03:00
parent f0896a0b75
commit f5a6a39159
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
syscalls/linux.cpp
View File

@ -2491,7 +2491,7 @@ static int linux_openat(SysFrm *, int dirfd, const char *pathname, int flags, mo
} }
/* Undocumented? */ /* Undocumented? */
static long linux_newfstatat(SysFrm *, int dfd, const char *filename, static long linux_newfstatat(SysFrm *, int dfd, const char *pathname,
struct stat *statbuf, int flag) struct stat *statbuf, int flag)
{ {
/* FIXME: This function is not working at all? */ /* FIXME: This function is not working at all? */
@ -2503,10 +2503,23 @@ static long linux_newfstatat(SysFrm *, int dfd, const char *filename,
if (flag) if (flag)
fixme("flag %#x is stub", flag); fixme("flag %#x is stub", flag);
const char *pPathname = vma->UserCheckAndGetAddress(pathname);
struct stat *pStatbuf = vma->UserCheckAndGetAddress(statbuf);
if (pPathname == nullptr || pStatbuf == nullptr)
return -EFAULT;
if (dfd == AT_FDCWD) if (dfd == AT_FDCWD)
{ {
fixme("dfd AT_FDCWD is stub"); vfs::RefNode *absoluteNode = fs->Open(pPathname, pcb->CurrentWorkingDirectory);
return -ENOSYS; if (!absoluteNode)
return -ENOENT;
const char *absPath = new char[strlen(absoluteNode->node->FullPath) + 1];
strcpy((char *)absPath, absoluteNode->node->FullPath);
delete absoluteNode;
int ret = fdt->_stat(absPath, pStatbuf);
delete[] absPath;
return ret;
} }
vfs::FileDescriptorTable::Fildes & vfs::FileDescriptorTable::Fildes &
@ -2517,13 +2530,8 @@ static long linux_newfstatat(SysFrm *, int dfd, const char *filename,
return -EBADF; return -EBADF;
} }
const char *pFilename = vma->UserCheckAndGetAddress(filename); debug("%s %#lx %#lx", pPathname, pathname, statbuf);
struct stat *pStatbuf = vma->UserCheckAndGetAddress(statbuf); return fdt->_stat(pPathname, pStatbuf);
if (pFilename == nullptr || pStatbuf == nullptr)
return -EFAULT;
debug("%s %#lx %#lx", pFilename, filename, statbuf);
return fdt->_stat(pFilename, pStatbuf);
} }
/* https://man7.org/linux/man-pages/man2/pipe2.2.html */ /* https://man7.org/linux/man-pages/man2/pipe2.2.html */