PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use lseek64 instead of lseek

Browse Source 
Otherwise, overflow problems can occur with images larger than
2G since the offsets will overflow a 32-bit off_t.

Change-Id: I05951a38ebeae83ad2cb938594e8d8adb323e2aa
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie
2014-09-04 07:54:17 -07:00
committed by Doug Zongker
parent 5f875bf577
commit 8328922ff0
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/blockimg.c
+11 -11
View File
@@ -106,12 +106,12 @@ static void writeblock(int fd, const uint8_t* data, size_t size) {
} }
} }
static void check_lseek(int fd, off_t offset, int whence) { static void check_lseek(int fd, off64_t offset, int whence) {
while (true) { while (true) {
off_t ret = lseek(fd, offset, whence); off64_t ret = lseek64(fd, offset, whence);
if (ret < 0) { if (ret < 0) {
if (errno != EINTR) { if (errno != EINTR) {
fprintf(stderr, "lseek failed: %s\n", strerror(errno)); fprintf(stderr, "lseek64 failed: %s\n", strerror(errno));
exit(1); exit(1);
} }
} else { } else {
@@ -165,7 +165,7 @@ static ssize_t RangeSinkWrite(const uint8_t* data, ssize_t size, void* token) {
++rss->p_block; ++rss->p_block;
if (rss->p_block < rss->tgt->count) { if (rss->p_block < rss->tgt->count) {
rss->p_remain = (rss->tgt->pos[rss->p_block*2+1] - rss->tgt->pos[rss->p_block*2]) * BLOCKSIZE; rss->p_remain = (rss->tgt->pos[rss->p_block*2+1] - rss->tgt->pos[rss->p_block*2]) * BLOCKSIZE;
check_lseek(rss->fd, rss->tgt->pos[rss->p_block*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(rss->fd, (off64_t)rss->tgt->pos[rss->p_block*2] * BLOCKSIZE, SEEK_SET);
} else { } else {
// we can't write any more; return how many bytes have // we can't write any more; return how many bytes have
// been written so far. // been written so far.
@@ -414,7 +414,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
allocate(src->size * BLOCKSIZE, &buffer, &buffer_alloc); allocate(src->size * BLOCKSIZE, &buffer, &buffer_alloc);
size_t p = 0; size_t p = 0;
for (i = 0; i < src->count; ++i) { for (i = 0; i < src->count; ++i) {
check_lseek(fd, src->pos[i*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)src->pos[i*2] * BLOCKSIZE, SEEK_SET);
size_t sz = (src->pos[i*2+1] - src->pos[i*2]) * BLOCKSIZE; size_t sz = (src->pos[i*2+1] - src->pos[i*2]) * BLOCKSIZE;
readblock(fd, buffer+p, sz); readblock(fd, buffer+p, sz);
p += sz; p += sz;
@@ -422,7 +422,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
p = 0; p = 0;
for (i = 0; i < tgt->count; ++i) { for (i = 0; i < tgt->count; ++i) {
check_lseek(fd, tgt->pos[i*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)tgt->pos[i*2] * BLOCKSIZE, SEEK_SET);
size_t sz = (tgt->pos[i*2+1] - tgt->pos[i*2]) * BLOCKSIZE; size_t sz = (tgt->pos[i*2+1] - tgt->pos[i*2]) * BLOCKSIZE;
writeblock(fd, buffer+p, sz); writeblock(fd, buffer+p, sz);
p += sz; p += sz;
@@ -445,7 +445,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
allocate(BLOCKSIZE, &buffer, &buffer_alloc); allocate(BLOCKSIZE, &buffer, &buffer_alloc);
memset(buffer, 0, BLOCKSIZE); memset(buffer, 0, BLOCKSIZE);
for (i = 0; i < tgt->count; ++i) { for (i = 0; i < tgt->count; ++i) {
check_lseek(fd, tgt->pos[i*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)tgt->pos[i*2] * BLOCKSIZE, SEEK_SET);
for (j = tgt->pos[i*2]; j < tgt->pos[i*2+1]; ++j) { for (j = tgt->pos[i*2]; j < tgt->pos[i*2+1]; ++j) {
writeblock(fd, buffer, BLOCKSIZE); writeblock(fd, buffer, BLOCKSIZE);
} }
@@ -470,7 +470,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
rss.tgt = tgt; rss.tgt = tgt;
rss.p_block = 0; rss.p_block = 0;
rss.p_remain = (tgt->pos[1] - tgt->pos[0]) * BLOCKSIZE; rss.p_remain = (tgt->pos[1] - tgt->pos[0]) * BLOCKSIZE;
check_lseek(fd, tgt->pos[0] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)tgt->pos[0] * BLOCKSIZE, SEEK_SET);
pthread_mutex_lock(&nti.mu); pthread_mutex_lock(&nti.mu);
nti.rss = &rss; nti.rss = &rss;
@@ -504,7 +504,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
allocate(src->size * BLOCKSIZE, &buffer, &buffer_alloc); allocate(src->size * BLOCKSIZE, &buffer, &buffer_alloc);
size_t p = 0; size_t p = 0;
for (i = 0; i < src->count; ++i) { for (i = 0; i < src->count; ++i) {
check_lseek(fd, src->pos[i*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)src->pos[i*2] * BLOCKSIZE, SEEK_SET);
size_t sz = (src->pos[i*2+1] - src->pos[i*2]) * BLOCKSIZE; size_t sz = (src->pos[i*2+1] - src->pos[i*2]) * BLOCKSIZE;
readblock(fd, buffer+p, sz); readblock(fd, buffer+p, sz);
p += sz; p += sz;
@@ -520,7 +520,7 @@ Value* BlockImageUpdateFn(const char* name, State* state, int argc, Expr* argv[]
rss.tgt = tgt; rss.tgt = tgt;
rss.p_block = 0; rss.p_block = 0;
rss.p_remain = (tgt->pos[1] - tgt->pos[0]) * BLOCKSIZE; rss.p_remain = (tgt->pos[1] - tgt->pos[0]) * BLOCKSIZE;
check_lseek(fd, tgt->pos[0] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)tgt->pos[0] * BLOCKSIZE, SEEK_SET);
if (style[0] == 'i') { // imgdiff if (style[0] == 'i') { // imgdiff
ApplyImagePatch(buffer, src->size * BLOCKSIZE, ApplyImagePatch(buffer, src->size * BLOCKSIZE,
@@ -620,7 +620,7 @@ Value* RangeSha1Fn(const char* name, State* state, int argc, Expr* argv[]) {
int i, j; int i, j;
for (i = 0; i < rs->count; ++i) { for (i = 0; i < rs->count; ++i) {
check_lseek(fd, rs->pos[i*2] * (off_t)BLOCKSIZE, SEEK_SET); check_lseek(fd, (off64_t)rs->pos[i*2] * BLOCKSIZE, SEEK_SET);
for (j = rs->pos[i*2]; j < rs->pos[i*2+1]; ++j) { for (j = rs->pos[i*2]; j < rs->pos[i*2+1]; ++j) {
readblock(fd, buffer, BLOCKSIZE); readblock(fd, buffer, BLOCKSIZE);
SHA_update(&ctx, buffer, BLOCKSIZE); SHA_update(&ctx, buffer, BLOCKSIZE);