picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

coredump: use next_datagram_size_fd instead of ioctl(FIONREAD) (#3237)

Browse source 
We need to be sure that the size returned here actually matches what we will read with recvmsg() next

Fixes #2984
This commit is contained in:
Evgeny Vereshchagin 2016-05-11 15:29:24 +03:00 committed by Lennart Poettering
parent 4b273d46bb
commit fe1ef0f86e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/coredump/coredump.c
View file

@ -739,15 +739,16 @@ static int process_socket(int fd) {
.msg_iovlen = 1,
};
ssize_t n;
int l;
ssize_t l;
if (!GREEDY_REALLOC(iovec, n_iovec_allocated, n_iovec + 3)) {
r = log_oom();
goto finish;
}
if (ioctl(fd, FIONREAD, &l) < 0) {
r = log_error_errno(errno, "FIONREAD failed: %m");
l = next_datagram_size_fd(fd);
if (l < 0) {
r = log_error_errno(l, "Failed to determine datagram size to read: %m");
goto finish;
}