aboutsummaryrefslogtreecommitdiff
path: root/mkfs
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-05-04 15:32:52 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-05-04 22:22:48 +0200
commit2b975a449c17268f943403176a7609079b7af084 (patch)
treefee51e2f4b4f424c9a55dc35fb7aad21e3ce6580 /mkfs
parent6f7ee71165b30272a4f18bca361c324c7671680c (diff)
Remove compressor internal buffers
Pass in an external destination buffer + size and allow for propper bounds checking (especially when unpacking). Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'mkfs')
-rw-r--r--mkfs/block.c27
-rw-r--r--mkfs/mksquashfs.h1
-rw-r--r--mkfs/options.c3
3 files changed, 24 insertions, 7 deletions
diff --git a/mkfs/block.c b/mkfs/block.c
index d68c0c7..3472346 100644
--- a/mkfs/block.c
+++ b/mkfs/block.c
@@ -6,22 +6,26 @@ static int write_block(file_info_t *fi, sqfs_info_t *info)
{
size_t idx, bs;
ssize_t ret;
+ void *ptr;
idx = info->file_block_count++;
bs = info->super.block_size;
- ret = info->cmp->do_block(info->cmp, info->block, bs);
+ ret = info->cmp->do_block(info->cmp, info->block, bs,
+ info->scratch, bs);
if (ret < 0)
return -1;
if (ret > 0) {
+ ptr = info->scratch;
bs = ret;
fi->blocksizes[idx] = bs;
} else {
+ ptr = info->block;
fi->blocksizes[idx] = bs | (1 << 24);
}
- ret = write_retry(info->outfd, info->block, bs);
+ ret = write_retry(info->outfd, ptr, bs);
if (ret < 0) {
perror("writing to output file");
return -1;
@@ -41,8 +45,8 @@ static int flush_fragments(sqfs_info_t *info)
size_t newsz, size;
file_info_t *fi;
uint64_t offset;
+ void *new, *ptr;
ssize_t ret;
- void *new;
if (info->num_fragments == info->max_fragments) {
newsz = info->max_fragments ? info->max_fragments * 2 : 16;
@@ -64,7 +68,8 @@ static int flush_fragments(sqfs_info_t *info)
for (fi = info->frag_list; fi != NULL; fi = fi->frag_next)
fi->fragment = info->num_fragments;
- ret = info->cmp->do_block(info->cmp, info->fragment, size);
+ ret = info->cmp->do_block(info->cmp, info->fragment, size,
+ info->scratch, info->super.block_size);
if (ret < 0)
return -1;
@@ -72,16 +77,18 @@ static int flush_fragments(sqfs_info_t *info)
info->fragments[info->num_fragments].pad0 = 0;
if (ret > 0) {
+ ptr = info->scratch;
size = ret;
info->fragments[info->num_fragments].size = htole32(size);
} else {
+ ptr = info->fragment;
info->fragments[info->num_fragments].size =
htole32(size | (1 << 24));
}
info->num_fragments += 1;
- ret = write_retry(info->outfd, info->fragment, size);
+ ret = write_retry(info->outfd, ptr, size);
if (ret < 0) {
perror("writing to output file");
return -1;
@@ -203,12 +210,22 @@ int write_data_to_image(sqfs_info_t *info)
return -1;
}
+ info->scratch = malloc(info->super.block_size);
+ if (info->scratch == NULL) {
+ perror("allocating scratch buffer");
+ free(info->block);
+ free(info->fragment);
+ return -1;
+ }
+
ret = find_and_process_files(info, info->fs.root);
free(info->block);
free(info->fragment);
+ free(info->scratch);
info->block = NULL;
info->fragment = NULL;
+ info->scratch = NULL;
return ret;
}
diff --git a/mkfs/mksquashfs.h b/mkfs/mksquashfs.h
index f4ab53a..106822c 100644
--- a/mkfs/mksquashfs.h
+++ b/mkfs/mksquashfs.h
@@ -36,6 +36,7 @@ typedef struct {
fstree_t fs;
void *block;
void *fragment;
+ void *scratch;
sqfs_fragment_t *fragments;
size_t num_fragments;
diff --git a/mkfs/options.c b/mkfs/options.c
index a1077b4..f1fe192 100644
--- a/mkfs/options.c
+++ b/mkfs/options.c
@@ -248,8 +248,7 @@ void process_command_line(options_t *opt, int argc, char **argv)
break;
case 'b':
opt->blksz = read_number("Block size", optarg,
- SQFS_META_BLOCK_SIZE,
- 0xFFFFFFFF);
+ 4096, (1 << 20) - 1);
break;
case 'B':
opt->devblksz = read_number("Device block size", optarg,