kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Fix poll(2) not just clearing revents on negative fds.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2018-12-13 23:56:55 +01:00
parent 221fa7d954
commit 245ec6458a
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/poll.cpp
View file

@ -275,11 +275,6 @@ int sys_ppoll(struct pollfd* user_fds, size_t nfds,
PollNode* node = nodes + reqs; PollNode* node = nodes + reqs;
if ( fds[reqs].fd < 0 ) if ( fds[reqs].fd < 0 )
{ {
fds[reqs].revents = POLLNVAL;
// TODO: Should we set POLLNVAL in node->revents too? Should this
// system call ignore this error and keep polling, or return to
// user-space immediately? What if conditions are already true on
// some of the file descriptors (those we have processed so far?)?
node->revents = 0; node->revents = 0;
reqs++; reqs++;
continue; continue;
@ -335,8 +330,6 @@ int sys_ppoll(struct pollfd* user_fds, size_t nfds,
int num_events = 0; int num_events = 0;
for ( size_t i = 0; i < reqs; i++ ) for ( size_t i = 0; i < reqs; i++ )
{ {
if ( fds[i].fd < -1 )
continue;
if ( (fds[i].revents = nodes[i].revents) ) if ( (fds[i].revents = nodes[i].revents) )
num_events++; num_events++;
} }