From 9533092f7557e2f728d5fc59836ceac19658291d Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Wed, 28 Oct 2020 09:12:59 +0800 Subject: [PATCH] MA-18166 Android: Fix mmc multi blk load issue The 'offset' can be negative number passed from fsl_read_from_partition_multi(), don't covert 'blksz' to 'uint64_t' as it will cause overflow when the 'offset' is negative number. Test: mmc blk read with 'offset < 0'. Signed-off-by: Ji Luo Change-Id: Id1ce8e0c748dd280d70c1722cc7d17cc9646a4bb (cherry picked from commit 077b448679b9ad2891495c7344ba99a6c10a59fb) (cherry picked from commit f927599650ba1fbdbe8f4887b970a4f003b0d277) --- lib/avb/fsl/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/avb/fsl/utils.c b/lib/avb/fsl/utils.c index 3e70d576c8..e44cc8a9f2 100644 --- a/lib/avb/fsl/utils.c +++ b/lib/avb/fsl/utils.c @@ -26,9 +26,9 @@ int get_margin_pos(uint64_t part_start, uint64_t part_end, unsigned long blksz, return -1; if (offset < 0) { - margin->blk_start = (offset + 1) / (uint64_t)blksz + part_end; + margin->blk_start = (offset + 1) / (int64_t)blksz + part_end; // offset == -1 means the last byte?, or start need -1 - margin->start = (off = offset % (uint64_t)blksz) == 0 ? + margin->start = (off = offset % (int64_t)blksz) == 0 ? 0 : blksz + off; if (offset + num_bytes - 1 >= 0) { if (!allow_partial) @@ -38,9 +38,9 @@ int get_margin_pos(uint64_t part_start, uint64_t part_end, unsigned long blksz, } else { // which blk the last byte is in margin->blk_end = (num_bytes + offset) / - (uint64_t)blksz + part_end; + (int64_t)blksz + part_end; margin->end = (off = (num_bytes + offset - 1) % - (uint64_t)blksz) == 0 ? + (int64_t)blksz) == 0 ? 0 : blksz + off; // last byte } } else { -- 2.17.1