github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 13:08:38 +00:00
Code Issues Projects Releases Wiki Activity

transfused: improve read_message robustness

Browse Source 
Signed-off-by: David Sheets <dsheets@docker.com>
This commit is contained in:
David Sheets 2016-12-14 14:37:39 +00:00
parent 470063b79b
commit 6b1ef63d79
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
alpine/packages/transfused/transfused.c
View File

@ -184,21 +184,24 @@ uint64_t message_id(uint64_t *message)
int read_message(char *descr, parameters *params, int fd, int read_message(char *descr, parameters *params, int fd,
char *buf, size_t max_read){ char *buf, size_t max_read){
int read_count; ssize_t read_count;
size_t upto = 0;
size_t nbyte; size_t nbyte;
uint32_t len; uint32_t len;
/* TODO: socket read conditions e.g.EAGAIN */ do {
read_count = read(fd, buf, 4); read_count = read(fd, buf + upto, sizeof(uint32_t) - upto);
if (read_count != 4) { if (read_count == -1) {
if (read_count < 0) if (errno == EAGAIN || errno == EINTR)
continue;
die(1, params, "", "read %s: error reading: ", descr); die(1, params, "", "read %s: error reading: ", descr);
}
if (read_count == 0) if (read_count == 0)
die(1, params, NULL, die(1, params, NULL,
"read %s: EOF reading length", descr); "read %s: EOF reading length", descr);
die(1, params, NULL, upto += read_count;
"read %s: short read length %d", descr, read_count); } while (upto < sizeof(uint32_t));
}
len = *((uint32_t *) buf); len = *((uint32_t *) buf);
if (len > max_read) if (len > max_read)
die(1, params, NULL, die(1, params, NULL,
@ -209,10 +212,12 @@ int read_message(char *descr, parameters *params, int fd,
buf += 4; buf += 4;
do { do {
/* TODO: socket read conditions e.g.EAGAIN */
read_count = read(fd, buf, nbyte); read_count = read(fd, buf, nbyte);
if (read_count < 0) if (read_count < 0) {
if (errno == EAGAIN || errno == EINTR)
continue;
die(1, params, "", "read %s: error reading: ", descr); die(1, params, "", "read %s: error reading: ", descr);
}
if (read_count == 0) if (read_count == 0)
die(1, params, NULL, "read %s: EOF reading", descr); die(1, params, NULL, "read %s: EOF reading", descr);
nbyte -= read_count; nbyte -= read_count;