diff options
| author | Chen Lin Z <lin.z.chen@intel.com> | 2019-02-12 10:45:20 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-12 10:45:20 -0800 |
| commit | b0012be05f6397493058e5d1c4b3cd8579784dac (patch) | |
| tree | bb3de579068c34e48de10d58b067e4d5be568b0a | |
| parent | 0a3189f2bda634bead168fdd7064b89ed9b7eff3 (diff) | |
| parent | 8c350c8f5b9b50071156df68aba31d7d7b7b6b12 (diff) | |
| download | android_external_e2fsprogs-b0012be05f6397493058e5d1c4b3cd8579784dac.tar.gz android_external_e2fsprogs-b0012be05f6397493058e5d1c4b3cd8579784dac.tar.bz2 android_external_e2fsprogs-b0012be05f6397493058e5d1c4b3cd8579784dac.zip | |
Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8
am: 8c350c8f5b
Change-Id: Ie626f1f72f08ad812415ac6d0a8e99db2cbce747
| -rw-r--r-- | misc/create_inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/create_inode.c b/misc/create_inode.c index 05aa6363..7b3a8ee2 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -438,8 +438,8 @@ 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, - EXT2_SEEK_SET, NULL); + err = ext2fs_file_llseek(e2_file, off + bpos, + EXT2_SEEK_SET, NULL); if (err) goto fail; while (blen > 0) { @@ -480,8 +480,8 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, if (hole < 0) return EXT2_ET_UNIMPLEMENTED; - data_blk = data & ~(fs->blocksize - 1); - hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); + data_blk = data & ~(off_t)(fs->blocksize - 1); + hole_blk = (hole + (fs->blocksize - 1)) & ~(off_t)(fs->blocksize - 1); err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, zerobuf); if (err) |