openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Restrict the verification in block-based incremental OTAs 

automerge: daebaa6

* commit 'daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
  Restrict the verification in block-based incremental OTAs
This commit is contained in:
Tao Bao 2015-03-18 18:44:53 +00:00 committed by android-build-merger
parent 597cfdb9db daebaa6ed3
commit 07f682983a
2 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/releasetools/common.py
View File

@ -1024,20 +1024,22 @@ def ComputeDifferences(diffs):
class BlockDifference: class BlockDifference:
def __init__(self, partition, tgt, src=None, check_first_block=False): def __init__(self, partition, tgt, src=None, check_first_block=False, version=None):
self.tgt = tgt self.tgt = tgt
self.src = src self.src = src
self.partition = partition self.partition = partition
self.check_first_block = check_first_block self.check_first_block = check_first_block
version = 1 if version is None:
if OPTIONS.info_dict: version = 1
version = max( if OPTIONS.info_dict:
int(i) for i in version = max(
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(",")) int(i) for i in
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
self.version = version
b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads, b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads,
version=version) version=self.version)
tmpdir = tempfile.mkdtemp() tmpdir = tempfile.mkdtemp()
OPTIONS.tempfiles.append(tmpdir) OPTIONS.tempfiles.append(tmpdir)
self.path = os.path.join(tmpdir, partition) self.path = os.path.join(tmpdir, partition)
@ -1066,12 +1068,19 @@ class BlockDifference:
(self.device, self.src.care_map.to_string_raw(), (self.device, self.src.care_map.to_string_raw(),
self.src.TotalSha1())) self.src.TotalSha1()))
script.Print("Verified %s image..." % (self.partition,)) script.Print("Verified %s image..." % (self.partition,))
script.AppendExtra(('else\n' # Abort the OTA update if it doesn't support resumable OTA (i.e. version<3)
' (range_sha1("%s", "%s") == "%s") ||\n' # and the checksum doesn't match the one in the source partition.
' abort("%s partition has unexpected contents");\n' if self.version < 3:
'endif;') % script.AppendExtra(('else\n'
(self.device, self.tgt.care_map.to_string_raw(), ' abort("%s partition has unexpected contents");\n'
self.tgt.TotalSha1(), self.partition)) 'endif;') % (self.partition))
else:
script.AppendExtra(('else\n'
' (range_sha1("%s", "%s") == "%s") ||\n'
' abort("%s partition has unexpected contents");\n'
'endif;') %
(self.device, self.tgt.care_map.to_string_raw(),
self.tgt.TotalSha1(), self.partition))
def _WriteUpdate(self, script, output_zip): def _WriteUpdate(self, script, output_zip):
partition = self.partition partition = self.partition

32
tools/releasetools/ota_from_target_files
View File

@ -740,8 +740,16 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
system_src = GetImage("system", OPTIONS.source_tmp, OPTIONS.source_info_dict) system_src = GetImage("system", OPTIONS.source_tmp, OPTIONS.source_info_dict)
system_tgt = GetImage("system", OPTIONS.target_tmp, OPTIONS.target_info_dict) system_tgt = GetImage("system", OPTIONS.target_tmp, OPTIONS.target_info_dict)
blockimgdiff_version = 1
if OPTIONS.info_dict:
blockimgdiff_version = max(
int(i) for i in
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
system_diff = common.BlockDifference("system", system_tgt, system_src, system_diff = common.BlockDifference("system", system_tgt, system_src,
check_first_block=True) check_first_block=True,
version=blockimgdiff_version)
if HasVendorPartition(target_zip): if HasVendorPartition(target_zip):
if not HasVendorPartition(source_zip): if not HasVendorPartition(source_zip):
@ -749,7 +757,8 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
vendor_src = GetImage("vendor", OPTIONS.source_tmp, OPTIONS.source_info_dict) vendor_src = GetImage("vendor", OPTIONS.source_tmp, OPTIONS.source_info_dict)
vendor_tgt = GetImage("vendor", OPTIONS.target_tmp, OPTIONS.target_info_dict) vendor_tgt = GetImage("vendor", OPTIONS.target_tmp, OPTIONS.target_info_dict)
vendor_diff = common.BlockDifference("vendor", vendor_tgt, vendor_src, vendor_diff = common.BlockDifference("vendor", vendor_tgt, vendor_src,
check_first_block=True) check_first_block=True,
version=blockimgdiff_version)
else: else:
vendor_diff = None vendor_diff = None
@ -810,11 +819,22 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
device_specific.IncrementalOTA_VerifyBegin() device_specific.IncrementalOTA_VerifyBegin()
if oem_props is None: if oem_props is None:
script.AssertSomeFingerprint(source_fp, target_fp) # When blockimgdiff version is less than 3 (non-resumable block-based OTA),
# patching on a device that's already on the target build will damage the
# system. Because operations like move don't check the block state, they
# always apply the changes unconditionally.
if blockimgdiff_version <= 2:
script.AssertSomeFingerprint(source_fp)
else:
script.AssertSomeFingerprint(source_fp, target_fp)
else: else:
script.AssertSomeThumbprint( if blockimgdiff_version <= 2:
GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict), script.AssertSomeThumbprint(
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
else:
script.AssertSomeThumbprint(
GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict),
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
if updating_boot: if updating_boot:
boot_type, boot_device = common.GetTypeAndDevice("/boot", OPTIONS.info_dict) boot_type, boot_device = common.GetTypeAndDevice("/boot", OPTIONS.info_dict)