summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorSafae Ouajih <souajih@baylibre.com>2023-02-06 00:50:09 +0100
committerPraneeth Bajjuri <praneeth@ti.com>2023-04-05 11:37:00 -0500
commita630f86007366499a830dba8dd664360918d7fff (patch)
tree1018903a3ed2acd923f58c47d8be8b29bf4a32e5 /boot
parent920344f9685043febdefded63ae23d00770cf6e2 (diff)
android: boot: content print is not supported for v3, v4 header version
commit bb5d692732ca02511f2f491af1e680c87373fd35 upstream. Content print is not supported for version 3 and 4 of boot image header. Thus, only print that content when v2 is used. Update android_print_contents() to print an error message when trying to print boot image header version 3 or 4 content. Signed-off-by: Safae Ouajih <souajih@baylibre.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/image-android.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/boot/image-android.c b/boot/image-android.c
index 15a735e230..31a5d30162 100644
--- a/boot/image-android.c
+++ b/boot/image-android.c
@@ -477,6 +477,10 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr,
*/
void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr)
{
+ if (hdr->header_version >= 3) {
+ printf("Content print is not supported for boot image header version > 2");
+ return;
+ }
const char * const p = IMAGE_INDENT_STRING;
/* os_version = ver << 11 | lvl */
u32 os_ver = hdr->os_version >> 11;
@@ -509,7 +513,7 @@ void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr)
hdr->header_size);
}
- if (hdr->header_version >= 2) {
+ if (hdr->header_version == 2) {
printf("%sdtb size: %x\n", p, hdr->dtb_size);
printf("%sdtb addr: %llx\n", p, hdr->dtb_addr);
}