Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tar2qfile: use read_all() instead of read()

Browse Source 
read() syscall do not guarantee to read as much data as requested. This
is especially important when reading from pipe - remote end can produce
data slower than we are reading them. Use read_all() helper to always
get requested amount of data.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-25 02:24:21 +01:00
parent 9b859c9ac5
commit 3c92cdba22
1 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
qubes-rpc/tar2qfile.c
View File

@ -819,11 +819,12 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr,"Need to remove pad:%lld %lld\n",untrusted_hdr->filelen,BLKMULT-(untrusted_hdr->filelen%BLKMULT)); fprintf(stderr,"Need to remove pad:%lld %lld\n",untrusted_hdr->filelen,BLKMULT-(untrusted_hdr->filelen%BLKMULT));
#endif #endif
if (untrusted_hdr->filelen%BLKMULT > 0) if (untrusted_hdr->filelen%BLKMULT > 0) {
ret = read(fd, buf, BLKMULT-(untrusted_hdr->filelen%BLKMULT)); if (!read_all(fd, buf, BLKMULT-(untrusted_hdr->filelen%BLKMULT))) {
#ifdef DEBUG wait_for_result();
fprintf(stderr,"Removed %d bytes of padding\n",ret); exit(1);
#endif }
}
// Resync trailing headers in order to find next file chunck in the tar file // Resync trailing headers in order to find next file chunck in the tar file
return NEED_SYNC_TRAIL; return NEED_SYNC_TRAIL;
@ -866,31 +867,27 @@ void tar_file_processor(int fd, struct filters *filters)
struct stat sb; /* stat buffer see stat(2) */ struct stat sb; /* stat buffer see stat(2) */
char buf[BLKMULT+1]; char buf[BLKMULT+1];
size_t size;
i=0; i=0;
current = NEED_READ; current = NEED_READ;
size_t to_skip = 0; size_t to_skip = 0;
int sync_count = 0; int sync_count = 0;
while ((size = read(fd, &buf, BLKMULT))) { while (read_all(fd, buf, BLKMULT)) {
if (size != -1) {
#ifdef DEBUG
fprintf(stderr,"Read %ld bytes\n",size);
#endif
ret = 0; ret = 0;
if (current==NEED_SYNC_TRAIL) { if (current==NEED_SYNC_TRAIL) {
ret = tar_trail (buf, 1, &sync_count); ret = tar_trail (buf, 1, &sync_count);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr,"Synchronizing trail: %d %d\n",ret,sync_count); fprintf(stderr,"Synchronizing trail: %d %d\n", ret, sync_count);
#endif #endif
if (ret != 1) { if (ret != 1) {
current = NEED_READ; current = NEED_READ;
sync_count = 0;
} }
} }
if (current==NEED_READ) { if (current==NEED_READ) {
current = ustar_rd(fd, &hdr, buf, &sb, filters); current = ustar_rd(fd, &hdr, buf, &sb, filters);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr,"Return %d\n",ret); fprintf(stderr,"Return %d\n", current);
#endif #endif
} }
if (current==NEED_SKIP || current==NEED_SKIP_FILE) { if (current==NEED_SKIP || current==NEED_SKIP_FILE) {
@ -908,29 +905,26 @@ void tar_file_processor(int fd, struct filters *filters)
#endif #endif
return; return;
} }
to_skip = hdr.filelen;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr,"Need to skip %lld bytes (matched filters %d < %d)\n", fprintf(stderr,"Need to skip %lld bytes (matched filters %d < %d)\n",
hdr.filelen, filters->matched_filters, filters->filters_count); hdr.filelen, filters->matched_filters, filters->filters_count);
#endif
to_skip = hdr.filelen;
while (to_skip > 0) {
to_skip -= read(fd, &buf, MIN(to_skip,BLKMULT));
}
// Extract extra padding
#ifdef DEBUG
fprintf(stderr,"Need to remove pad:%ld %lld %lld\n",to_skip,hdr.filelen,BLKMULT-(hdr.filelen%BLKMULT)); fprintf(stderr,"Need to remove pad:%ld %lld %lld\n",to_skip,hdr.filelen,BLKMULT-(hdr.filelen%BLKMULT));
#endif #endif
if (hdr.filelen%BLKMULT > 0) { if (to_skip%BLKMULT > 0) {
ret = read(fd, &buf, BLKMULT-(hdr.filelen%BLKMULT)); to_skip += BLKMULT-(to_skip%BLKMULT);
#ifdef DEBUG
fprintf(stderr,"Removed %d bytes of padding\n",ret);
#endif
} }
while (to_skip > 0) {
ret = read_all(fd, &buf, MIN(to_skip,BLKMULT));
if (ret <= 0) {
exit(1);
}
to_skip -= MIN(to_skip,BLKMULT);
}
current = NEED_SYNC_TRAIL; current = NEED_SYNC_TRAIL;
} }
i++; i++;
}
//if (i >= 10) //if (i >= 10)
// exit(0); // exit(0);
} }