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

tar2qfile: improved to skip everything but regular files

Browse Source
This commit is contained in:
Olivier MEDOC 2013-10-04 16:26:44 +02:00
parent c26d4b4d30
commit a05e21ee5f
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qubes-rpc/tar2qfile.c
View File

@ -683,14 +683,7 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
case EXTHEADERTYPE: case EXTHEADERTYPE:
fprintf(stderr,"Extended HEADER encountered\n"); fprintf(stderr,"Extended HEADER encountered\n");
fprintf(stderr,"Need to skip %d bytes. Skipping a full block\n",sb->st_size); return NEED_SKIP;
sb->st_size = BLKMULT;
while (sb->st_size > 0) {
sb->st_size -= read(fd, buf, MAX(sb->st_size,BLKMULT));
fprintf(stderr,"now at %d\n",sb->st_size);
}
break; break;
default: default:
fprintf(stderr,"Default type detected:%c\n",hd->typeflag); fprintf(stderr,"Default type detected:%c\n",hd->typeflag);
@ -705,7 +698,7 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
// arcn->sb.st_mode |= S_IFREG; // arcn->sb.st_mode |= S_IFREG;
break; break;
} }
return NEED_READ; return NEED_SKIP;
} }
@ -724,7 +717,8 @@ int tar_file_processor(int fd)
i=0; i=0;
current = NEED_READ; current = NEED_READ;
long sync_count = 0; size_t to_skip = 0;
int sync_count = 0;
while (size = read(fd, &buf, BLKMULT)) { while (size = read(fd, &buf, BLKMULT)) {
fprintf(stderr,"Read %d bytes\n",size); fprintf(stderr,"Read %d bytes\n",size);
@ -740,6 +734,19 @@ int tar_file_processor(int fd)
current = ustar_rd(fd, &hdr, &buf, &sb); current = ustar_rd(fd, &hdr, &buf, &sb);
fprintf(stderr,"Return %d\n",ret); fprintf(stderr,"Return %d\n",ret);
} }
if (current==NEED_SKIP) {
fprintf(stderr,"Need to skip %d bytes\n",sb.st_size);
to_skip = sb.st_size;
while (to_skip > 0) {
to_skip -= read(fd, &buf, MIN(to_skip,BLKMULT));
}
// Extract extra padding
fprintf(stderr,"Need to remove pad:%d %d %d\n",to_skip,sb.st_size,BLKMULT-(sb.st_size%BLKMULT));
ret = read(fd, &buf, BLKMULT-(sb.st_size%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret);
current = NEED_READ;
}
i++; i++;
//if (i >= 10) //if (i >= 10)
// exit(0); // exit(0);