diff options
| author | Tom Rini <[email protected]> | 2024-09-16 14:48:13 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-09-16 14:48:13 -0600 |
| commit | 19dbc09405d3503ce3efef3c2e4b4f0f1a03372d (patch) | |
| tree | eb40b0e0cb3c32dbafb25cc7fb6f988908c32ca9 /boot | |
| parent | 979207ed6bac1b148802abb85750fc5e9cea223e (diff) | |
| parent | c97ada2dc66934ee00a7a03d9ed078bdfb7b4039 (diff) | |
Merge tag 'v2024.10-rc5' into next
Prepare v2024.10-rc5
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/android_ab.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 143f373aae9..1196a189ed5 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -139,8 +139,13 @@ static int ab_control_store(struct blk_desc *dev_desc, { ulong abc_offset, abc_blocks, ret; - abc_offset = offset + - offsetof(struct bootloader_message_ab, slot_suffix) / + if (offset % part_info->blksz) { + log_err("ANDROID: offset not block aligned\n"); + return -EINVAL; + } + + abc_offset = (offset + + offsetof(struct bootloader_message_ab, slot_suffix)) / part_info->blksz; abc_blocks = DIV_ROUND_UP(sizeof(struct bootloader_control), part_info->blksz); |