summaryrefslogtreecommitdiffstats
path: root/applypatch
Commit message (Collapse)AuthorAgeFilesLines
* imgdiff: skip spurious gzip headers in image filesDavid Riley2015-12-281-6/+14
| | | | | | | | | | | | | dragon kernel is compressed via lz4 for boot speed and bootloader support reasons and recent prebuilts happen to include the gzip header sequence which is causing imgdiff to fail. Detect a spurious gzip header and treat the section as a normal section. Bug: 26133184 Change-Id: I369d7d576fd7d2c579c0780fc5c669a5b6ea0d3d (cherry picked from commit 0f2f6a746af517afca9e5e089a4a17be0a9766d6) Signed-off-by: David Riley <davidriley@google.com>
* imgdiff: Fix compilation warningsSteve Kondik2015-11-071-15/+17
| | | | Change-Id: I17da2a21967f4484d7244f10f3bc5e74c6e559bf
* imgdiff: fix file descriptor leakJeremy Compostella2015-11-071-1/+9
| | | | | | | | | | mkstemp() allocates a file description that is never released. If MakePatch() is called too many time, imgdiff reaches the Operating System EMFILE (too many open files) limit. Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
* recovery: Switch to clangTao Bao2015-11-071-0/+5
| | | | | | And a few trival fixes to suppress warnings. Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65
* Stop using libstdc++.Dan Albert2015-11-071-2/+2
| | | | | | | | These are already getting libc++, so it isn't necessary. If any of the other static libraries (such as adb) use new or delete from libc++, there will be symbol collisions. Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
* Use f_bavail to calculate free spacecaozhiyuan2015-06-261-1/+1
| | | | | | | | | | | | | Failures are seen on devices with Linux 3.10. And they are mainly due to this change: https://lwn.net/Articles/546473/ The blocks reserved in this change is not the same thing as what we think are reserved for common usage of root user. And this part is included in free blocks but not in available blocks. Bug: 22118089 Change-Id: I81c9531703298019a4fc11839f28d2cc8b9df34e (cherry picked from commit 3b4977638f48e59d23d7ea2bb6dde78552c257fb)
* Check all lseek calls succeed.Elliott Hughes2015-04-291-24/+27
| | | | | | | | Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek. Bug: http://b/20625546 Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b (cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
* imgdiff: Avoid infinite loop if inflate failsJohan Redestig2015-04-151-0/+9
| | | | | | | Break out of the loop if inflate returns an error and print some details. Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
* am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
|\ | | | | | | | | * commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e': Add missing includes.
| * Add missing includes.Elliott Hughes2015-01-291-0/+1
| | | | | | | | Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
* | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-281-0/+1
|\ \ | |/ | | | | | | * commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3': Add missing includes.
| * Add missing includes.Elliott Hughes2015-01-281-0/+1
| | | | | | | | Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
* | Use more aggressive sync writing to applypatch.Michael Runge2014-10-291-8/+36
|/ | | | | | | | | | We have seen cases where the boot partition is patched, but upon recovery the partition appears to be corrupted. Open up all patched files/partitions with O_SYNC, and do not ignore the errors from fsync/close operations. Bug: 18170529 Change-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b
* installer for new block OTA systemDoug Zongker2014-08-194-9/+7
| | | | | | | (Cherry-pick back from master.) Bug: 16984795 Change-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4
* am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
|\ | | | | | | | | * commit 'c4804e9b9c143652d17441b4b672b920b11cc94a': fix vulnerability in bspatch
| * am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| |\ | | | | | | | | | | | | * commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd': fix vulnerability in bspatch
| | * fix vulnerability in bspatchDoug Zongker2014-05-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Patches with control data tuples with negative numbers in the first and/or second can cause bspatch to write to arbitrary locations in the heap. Change-Id: I8c5d81948be773e6483241131d3d166b6da27cb8
| * | am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-142-9/+10
| |\ \ | | |/ | | | | | | | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues
* | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-142-9/+10
|\ \ \ | | | | | | | | | | | | | | | | * commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49': Recovery 64-bit compile issues
| * \ \ am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-142-9/+10
| |\ \ \ | | |/ / | |/| / | | |/ | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues
| | * Recovery 64-bit compile issuesMark Salyzyn2014-03-142-9/+10
| | | | | | | | | | | | Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
* | | remove remaining libminelf referencesDoug Zongker2014-02-131-2/+2
| | | | | | | | | | | | Change-Id: Id38b08607829bccc031693cc03e60e849903b6f8
* | | remove 'retouch' ASLR supportDoug Zongker2014-02-133-32/+11
|/ / | | | | | | | | | | | | | | Older versions of android supported an ASLR system where binaries were randomly twiddled at OTA install time. Remove support for this; we now use the ASLR support in the linux kernel. Change-Id: I8348eb0d6424692668dc1a00e2416fbef6c158a2
* | fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-191-15/+3
|/ | | | | | | | | | | These were attempts to write partitions "conservatively" in hopes of fixing the problems with writing the radio partition on Nexus 4. They didn't work (a kernel patch was needed), but got left in. They make writing of partitions unnecessarily slow (ie, we really shouldn't need to sync() after every 4kb). Roll back most of them, but leave the verification read-back in. Change-Id: I94badc0979e88816c5aa0485f6316c02be69173c
* am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
|\ | | | | | | | | * commit 'a69b50c567d46afad73c4d6ab9e57f078ee73327': recovery: remove O_DIRECT, use O_SYNC only
| * recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
| | | | | | | | | | | | O_DIRECT writes fail with EINVAL due to alignment issues. Change-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b
* | am 660637f3: am e8d953aa: recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
|\ \ | |/ | | | | | | * commit '660637f3fc6fe20e8b7f47b98152138c2c92b7ec': recovery: more cargo-cult programming
| * recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
| | | | | | | | | | | | Add O_DIRECT|O_SYNC when opening partitions for write. Change-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c
* | am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing itDoug Zongker2013-07-111-2/+7
|\ \ | |/ | | | | | | * commit 'fbcfad33face5d3b9e6b8cb04379168bceb517df': recovery: sleep after writing partition and closing it
| * recovery: sleep after writing partition and closing itDoug Zongker2013-07-101-2/+7
| | | | | | | | | | | | | | Another speculative attempt to get everything we write actually stored to the device. Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
* | am 2148133d: am c870a99c: recovery: write partitions more conservativelyDoug Zongker2013-07-111-24/+46
|\ \ | |/ | | | | | | * commit '2148133d46cb875316b01947dd5719ed995f7d67': recovery: write partitions more conservatively
| * recovery: write partitions more conservativelyDoug Zongker2013-07-091-24/+46
| | | | | | | | | | | | | | | | | | Write and verify partitions using write(2) and read(2) rather than the stdio functions. Read and write in 4kb blocks. When writing, fsync() every 1MB. Bug: 9602014 Change-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f
* | am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
|\ \ | |/ | | | | | | * commit '0ccaccf7d0f50bb9555ee13a841c246a1fea80f2': recovery: try to write EMMC partitions more reliably
| * recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nexus 4 has flash errors that manifest during large writes (eg, of the radio partition). Writes of some blocks seem to be dropped silently, without any errors being returned to the user level. Make two changes to the partition-writing code: - break it up into 1MB writes instead of writing partitions with a single fwrite() call. Pause for 50ms in between every chunk. - read the partition back after writing and verify that we read what we wrote. Drop caches before reading so we (hopefully) are reading off the actual flash and not some cache. Neither of these should be necessary. Bug: 9602014 Change-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63
* | verifier: update to support certificates using SHA-256Doug Zongker2013-04-101-1/+1
|/ | | | Change-Id: Ifd5a29d459acf101311fa1c220f728c3d0ac2e4e
* reduce some recovery loggingDoug Zongker2012-10-191-6/+21
| | | | | | | | | | | Make minzip log only a count of files when extracting, not individual filenames. Make patching only chatter about free space if there's not enough and compact the other messages. Only the last 8k of the recovery log gets uploaded; this makes it more likely that we will get all of it. Change-Id: I529cb4947fe2185df82b9da5fae450a7480dcecd
* add bonus data feature to imgdiff/imgpatch/applypatchDoug Zongker2012-08-205-21/+99
| | | | | | | | | | | | | | The bonus data option lets you give an additional blob of uncompressed data to be used when constructing a patch for chunk #1 of an image. The same blob must be available at patch time, and can be passed to the command-line applypatch tool (this feature is not accessible from edify scripts). This will be used to reduce the size of recovery-from-boot patches by storing parts of the recovery ramdisk (the UI images) on the system partition. Change-Id: Iac1959cdf7f5e4582f8d434e83456e483b64c02c
* am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-171-1/+0
|\ | | | | | | | | | | | | * commit '3733d2185bbcedd9ef626907f1f32628986cc0f5': Use the static version of libsparse Multiple modules with the same name are going away. host modules don't need LOCAL_MODULE_TAGS
| * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-07-211-1/+0
| | | | | | | | Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
* | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-261-2/+2
|/ | | | | | | | | | When creating a new file using open(..., O_CREAT), it is an error to fail to specify a creation mode. If a mode is not specified, a random stack provided value is used as the "mode". This will become a compile error in a future Android change. Change-Id: I73c1e1a39ca36bf01704b07302af4971d234b5a8
* Add NOTICE fileWei Zhong2012-04-061-0/+41
| | | | | | | | | | | 1. AOSP_APACH2 2. BSD for bsdiff.c and bspatch.c Bug: 6299628 Change-Id: If9a5f7f8f07ad51bb62202253da189d804674e54 Signed-off-by: Wei Zhong <wzhong@google.com> (cherry picked from commit 592e7a9cf1c856bee2adb8f285ac359e2d7f68e1)
* fix buildDoug Zongker2012-02-282-2/+2
| | | | Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
* fix failure to free memoryDoug Zongker2012-02-282-19/+45
| | | | | | | The applypatch function is somewhat sloppy about freeing memory (since it was originally a standalone binary). Fix some of that. Change-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
* Fix x86 build.Ying Wang2011-02-081-2/+0
| | | | Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
* am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-161-1/+2
|\ | | | | | | | | | | | | Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb' * commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb': remove shadowed variable declaration
| * am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0' into gingerbread * commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0': remove shadowed variable declaration
| | * remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An accidental variable declaration ("int enough_space = ..." instead of "enough_space = " inside a block) shadowing the real one meant we were always using the copy-to-cache path for patching, even when not necessary. Remove it. Enforce an absolute minimum of free space as well, to avoid running into problems patching small files, now that the copy-to-cache path is (inadvertently) well-tested. Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
* | | am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7' * commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7': fix bug in applying patches
| * | am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-121-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '8cd9e4f3d4eba481b411482331293c8079ab24b2' into gingerbread * commit '8cd9e4f3d4eba481b411482331293c8079ab24b2': fix bug in applying patches