diff options
author | Elliott Hughes <enh@google.com> | 2015-04-28 17:24:24 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-04-29 21:14:56 -0700 |
commit | 2f5feedf1d705b53e5bf90c8b5207dd91f4522f1 (patch) | |
tree | e2c357667b0e76e6fa5a43c7a7951c872c373e9c /mtdutils/flash_image.c | |
parent | f7466f9f2334b0e9025e1c7ecf65b4d04a246b20 (diff) | |
download | bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.zip bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.tar.gz bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.tar.bz2 |
Check all lseek calls succeed.
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.
Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
(cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
Diffstat (limited to 'mtdutils/flash_image.c')
-rw-r--r-- | mtdutils/flash_image.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mtdutils/flash_image.c b/mtdutils/flash_image.c index 5657dfc..36ffa13 100644 --- a/mtdutils/flash_image.c +++ b/mtdutils/flash_image.c @@ -72,7 +72,7 @@ int main(int argc, char **argv) { if (fd < 0) die("error opening %s", argv[2]); char header[HEADER_SIZE]; - int headerlen = read(fd, header, sizeof(header)); + int headerlen = TEMP_FAILURE_RETRY(read(fd, header, sizeof(header))); if (headerlen <= 0) die("error reading %s header", argv[2]); MtdReadContext *in = mtd_read_partition(partition); @@ -104,7 +104,7 @@ int main(int argc, char **argv) { if (wrote != headerlen) die("error writing %s", argv[1]); int len; - while ((len = read(fd, buf, sizeof(buf))) > 0) { + while ((len = TEMP_FAILURE_RETRY(read(fd, buf, sizeof(buf)))) > 0) { wrote = mtd_write_data(out, buf, len); if (wrote != len) die("error writing %s", argv[1]); } @@ -125,13 +125,13 @@ int main(int argc, char **argv) { if (mtd_partition_info(partition, NULL, &block_size, NULL)) die("error getting %s block size", argv[1]); - if (lseek(fd, headerlen, SEEK_SET) != headerlen) + if (TEMP_FAILURE_RETRY(lseek(fd, headerlen, SEEK_SET)) != headerlen) die("error rewinding %s", argv[2]); int left = block_size - headerlen; while (left < 0) left += block_size; while (left > 0) { - len = read(fd, buf, left > (int)sizeof(buf) ? (int)sizeof(buf) : left); + len = TEMP_FAILURE_RETRY(read(fd, buf, left > (int)sizeof(buf) ? (int)sizeof(buf) : left)); if (len <= 0) die("error reading %s", argv[2]); if (mtd_write_data(out, buf, len) != len) die("error writing %s", argv[1]); |