diff options
| author | David Anderson <dvander@google.com> | 2021-11-11 01:55:27 +0000 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2021-11-11 22:09:01 +0800 |
| commit | 06193c09ddf65c6625f9368331d745cc6b7235de (patch) | |
| tree | 3cf08ae59a8ba8befea058bc4680b78bf374fecc | |
| parent | fddb9155f7971d09b63aab39bbdb1b9285e30d85 (diff) | |
| download | erofs-utils-06193c09ddf65c6625f9368331d745cc6b7235de.tar.gz | |
erofs-utils: mkfs: fix integer overflow in erofs_blob_remap
When using --chunksize, partitions greater than 2GiB can fail to build
due to integer overflow in erofs_blob_remap.
Link: https://lore.kernel.org/r/20211111015527.2717076-1-dvander@google.com
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: David Anderson <dvander@google.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
| -rw-r--r-- | include/erofs/io.h | 6 | ||||
| -rw-r--r-- | lib/blobchunk.c | 2 | ||||
| -rw-r--r-- | lib/io.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/erofs/io.h b/include/erofs/io.h index 2597c5c..9d73adc 100644 --- a/include/erofs/io.h +++ b/include/erofs/io.h @@ -27,9 +27,9 @@ u64 dev_length(void); extern int erofs_devfd; -int erofs_copy_file_range(int fd_in, erofs_off_t *off_in, - int fd_out, erofs_off_t *off_out, - size_t length); +ssize_t erofs_copy_file_range(int fd_in, erofs_off_t *off_in, + int fd_out, erofs_off_t *off_out, + size_t length); static inline int blk_write(const void *buf, erofs_blk_t blkaddr, u32 nblocks) diff --git a/lib/blobchunk.c b/lib/blobchunk.c index 661c5d0..a0ff79c 100644 --- a/lib/blobchunk.c +++ b/lib/blobchunk.c @@ -179,7 +179,7 @@ int erofs_blob_remap(void) struct erofs_buffer_head *bh; ssize_t length; erofs_off_t pos_in, pos_out; - int ret; + ssize_t ret; fflush(blobfile); length = ftell(blobfile); @@ -259,9 +259,9 @@ int dev_read(void *buf, u64 offset, size_t len) return 0; } -static int __erofs_copy_file_range(int fd_in, erofs_off_t *off_in, - int fd_out, erofs_off_t *off_out, - size_t length) +static ssize_t __erofs_copy_file_range(int fd_in, erofs_off_t *off_in, + int fd_out, erofs_off_t *off_out, + size_t length) { size_t copied = 0; char buf[8192]; @@ -331,9 +331,9 @@ static int __erofs_copy_file_range(int fd_in, erofs_off_t *off_in, return copied; } -int erofs_copy_file_range(int fd_in, erofs_off_t *off_in, - int fd_out, erofs_off_t *off_out, - size_t length) +ssize_t erofs_copy_file_range(int fd_in, erofs_off_t *off_in, + int fd_out, erofs_off_t *off_out, + size_t length) { #ifdef HAVE_COPY_FILE_RANGE off64_t off64_in = *off_in, off64_out = *off_out; |