RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 19:38:12 +00:00
Code Issues Activity Actions

LibCore: Don't crash in IPC client/server on EAGAIN

Browse source 
Instead, just sched_yield() and try again. This makes the WindowServer
not fall apart whenever clients take a bit too long to respond.

Fixes #656.
This commit is contained in:
Andreas Kling 2019-10-14 21:47:59 +02:00
parent 735f02900b
commit 7dbc13ac88
2 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Libraries/LibCore/CoreIPCServer.h
View file

@ -8,8 +8,8 @@
#include <LibCore/CObject.h>
#include <LibIPC/IEndpoint.h>
#include <LibIPC/IMessage.h>
#include <errno.h>
#include <sched.h>
#include <stdio.h>
#include <sys/socket.h>
#include <sys/types.h>
@ -104,21 +104,26 @@ namespace Server {
++iov_count;
}
int nwritten = writev(m_socket->fd(), iov, iov_count);
if (nwritten < 0) {
switch (errno) {
case EPIPE:
dbgprintf("Connection::post_message: Disconnected from peer.\n");
shutdown();
return;
case EAGAIN:
dbgprintf("Connection::post_message: Client buffer overflowed.\n");
did_misbehave();
return;
default:
perror("Connection::post_message writev");
ASSERT_NOT_REACHED();
int nwritten = 0;
for (;;) {
nwritten = writev(m_socket->fd(), iov, iov_count);
if (nwritten < 0) {
switch (errno) {
case EPIPE:
dbgprintf("Connection::post_message: Disconnected from peer.\n");
shutdown();
return;
case EAGAIN:
// FIXME: It would be better to push these onto a queue so we can go back
// to servicing other clients.
sched_yield();
continue;
default:
perror("Connection::post_message writev");
ASSERT_NOT_REACHED();
}
}
break;
}
ASSERT(nwritten == (int)(sizeof(message) + extra_data.size()));