RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:17:42 +00:00
Code Issues Activity Actions

Kernel: select() should fail with EBADF if any set contains an invalid fd.

Browse source
This commit is contained in:
Andreas Kling 2019-01-30 19:01:31 +01:00
parent b4e478aa50
commit 45fba60ab5
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Process.cpp
View file

@ -1981,23 +1981,31 @@ int Process::sys$select(const Syscall::SC_select_params* params)
if (nfds < 0) if (nfds < 0)
return -EINVAL; return -EINVAL;
// FIXME: Return -EBADF if one of the fd sets contains an invalid fd.
// FIXME: Return -EINTR if a signal is caught. // FIXME: Return -EINTR if a signal is caught.
// FIXME: Return -EINVAL if timeout is invalid. // FIXME: Return -EINVAL if timeout is invalid.
auto transfer_fds = [nfds] (fd_set* set, auto& vector) { auto transfer_fds = [this, nfds] (fd_set* set, auto& vector) -> int {
if (!set) if (!set)
return; return 0;
vector.clear_with_capacity(); vector.clear_with_capacity();
auto bitmap = Bitmap::wrap((byte*)set, FD_SETSIZE); auto bitmap = Bitmap::wrap((byte*)set, FD_SETSIZE);
for (int i = 0; i < nfds; ++i) { for (int i = 0; i < nfds; ++i) {
if (bitmap.get(i)) if (bitmap.get(i)) {
if (!file_descriptor(i))
return -EBADF;
vector.append(i); vector.append(i);
}
} }
return 0;
}; };
transfer_fds(writefds, m_select_write_fds); int error = 0;
transfer_fds(readfds, m_select_read_fds); error = transfer_fds(writefds, m_select_write_fds);
if (error)
return error;
error = transfer_fds(readfds, m_select_read_fds);
if (error)
return error;
#ifdef DEBUG_IO #ifdef DEBUG_IO
dbgprintf("%s<%u> selecting on (read:%u, write:%u), wakeup_req:%u, timeout=%p\n", name().characters(), pid(), m_select_read_fds.size(), m_select_write_fds.size(), m_wakeup_requested, timeout); dbgprintf("%s<%u> selecting on (read:%u, write:%u), wakeup_req:%u, timeout=%p\n", name().characters(), pid(), m_select_read_fds.size(), m_select_write_fds.size(), m_wakeup_requested, timeout);