From b2ffd2228f0d68d096f8003975f0f7ec28bd4313 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 1 Feb 2019 13:09:39 +0000 Subject: e2fsprogs: fix file system generation with large files When copying files into the file system the file offset was being truncated to a signed 32-bit value, so any files that are larger than 2^31 bytes were the right size, but no content after that point. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...0001-create_inode-fix-copying-large-files.patch | 50 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch new file mode 100644 index 0000000000..c89581dce8 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch @@ -0,0 +1,50 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 674ab87b8338372338d20e21a350f88b4ff6c7c8 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 1 Feb 2019 10:59:59 +0000 +Subject: [PATCH] create_inode: fix copying large files + +When copying large files into a ext filesystem at mkfs time the copy fails at +2^31 bytes in. There are two problems: + +copy_file_chunk() passes an offset (off_t, 64-bit typically) to +ext2fs_file_lseek() which expects a ext2_off_t (typedef to __u32) so the value +is truncated. Solve by calling ext2fs_file_llseek() which takes a u64 offset +instead. + +try_lseek_copy() rounds the data and hole offsets as found by lseek() to block +boundaries, but the calculation gets truncated to 32-bits. Solve by casting the +32-bit blocksize to off_t to ensure this doesn't happen. + +Signed-off-by: Ross Burton +--- + misc/create_inode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/misc/create_inode.c b/misc/create_inode.c +index 05aa6363..f106dcda 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -438,7 +438,7 @@ static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, + ptr += blen; + continue; + } +- err = ext2fs_file_lseek(e2_file, off + bpos, ++ err = ext2fs_file_llseek(e2_file, off + bpos, + EXT2_SEEK_SET, NULL); + if (err) + goto fail; +@@ -481,7 +481,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, + return EXT2_ET_UNIMPLEMENTED; + + data_blk = data & ~(fs->blocksize - 1); +- hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); ++ hole_blk = (hole + (off_t)(fs->blocksize - 1)) & ~(off_t)(fs->blocksize - 1); + err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, + zerobuf); + if (err) +-- +2.11.0 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb index ce95dec5fe..cffb5362d6 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb @@ -6,6 +6,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ file://mkdir_p.patch \ file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ + file://0001-create_inode-fix-copying-large-files.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ -- cgit 1.2.3-korg