enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

fix(kernel/syscalls): add null check for argp in linux_ioctl function

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2 2025-03-27 16:41:58 +00:00
parent b74d4db23b
commit ad0c1e15e0
Signed by: enderice2
GPG Key ID: FEB6B8A8507BA62E
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Kernel/subsystem/linux/syscall.cpp
View File

@ -1146,9 +1146,13 @@ static int linux_ioctl(SysFrm *, int fd, unsigned long request, void *argp)
vfs::FileDescriptorTable *fdt = pcb->FileDescriptors; vfs::FileDescriptorTable *fdt = pcb->FileDescriptors;
Memory::VirtualMemoryArea *vma = pcb->vma; Memory::VirtualMemoryArea *vma = pcb->vma;
auto pArgp = vma->UserCheckAndGetAddress(argp); void *pArgp = nullptr;
if (pArgp == nullptr) if (argp != nullptr)
return -linux_EFAULT; {
pArgp = vma->UserCheckAndGetAddress(argp);
if (pArgp == nullptr)
return -linux_EFAULT;
}
int ret = ConvertErrnoToLinux(fdt->usr_ioctl(fd, request, pArgp)); int ret = ConvertErrnoToLinux(fdt->usr_ioctl(fd, request, pArgp));
return ret; return ret;