ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-23 23:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: handle MSG_WAITALL in socket_fs_plugin

Browse Source 
Fixes #3774
This commit is contained in:
Alexander Boettcher 2020-05-25 16:27:45 +02:00 committed by Norman Feske
parent 1a620acc17
commit 64ef651d4d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
repos/libports/src/lib/libc/socket_fs_plugin.cc
View File

@ -735,7 +735,7 @@ extern "C" int socket_fs_listen(int libc_fd, int backlog)
static ssize_t do_recvfrom(File_descriptor *fd, static ssize_t do_recvfrom(File_descriptor *fd,
void *buf, ::size_t len, int flags, void *buf, ::size_t const len, int const flags,
struct sockaddr *src_addr, socklen_t *src_addrlen) struct sockaddr *src_addr, socklen_t *src_addrlen)
{ {
Socket_fs::Context *context = dynamic_cast<Socket_fs::Context *>(fd->context); Socket_fs::Context *context = dynamic_cast<Socket_fs::Context *>(fd->context);
@ -755,9 +755,27 @@ static ssize_t do_recvfrom(File_descriptor *fd,
int data_fd = flags & MSG_PEEK ? context->peek_fd() : context->data_fd(); int data_fd = flags & MSG_PEEK ? context->peek_fd() : context->data_fd();
try { try {
lseek(data_fd, 0, 0); if (lseek(data_fd, 0, SEEK_SET) != 0)
ssize_t out_len = read(data_fd, buf, len); return Errno(EINVAL);
return out_len;
size_t out_sum = 0;
do {
size_t const result = read(data_fd,
(char *)buf + out_sum,
len - out_sum);
if (result <= 0) { /* eof & error */
if (out_sum)
return out_sum;
return result;
}
out_sum += result;
} while ((flags & MSG_WAITALL) &&
(out_sum < len));
return out_sum;
} catch (Socket_fs::Context::Inaccessible) { } catch (Socket_fs::Context::Inaccessible) {
return Errno(EINVAL); return Errno(EINVAL);
} }