Refactor bootimg parser to avoid packed struct #5816
Draft
+119
−44
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ashishworks
requested review from
Rot127,
kazarmy,
ret2libc,
thestr4ng3r and
wargio
as code owners
notxvilka
requested changes
Jan 18, 2026
notxvilka
added
the
Requirements not met
wargio
reviewed
Jan 18, 2026
wargio
reviewed
Jan 20, 2026
Member
There was a problem hiding this comment.
there is a dedicated repo for this (check tests/README.md). also where this file comes from?
Author
There was a problem hiding this comment.
Okay, let me try a different approach.
wargio
reviewed
Jan 20, 2026
wargio
reviewed
Jan 20, 2026
Comment on lines
+63
to
+115
| // Read all 32-bit header fields (little-endian) | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->kernel_size)) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->kernel_addr)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->ramdisk_size)) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->ramdisk_addr)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->second_size)) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->second_addr)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->tags_addr)) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->page_size)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->unused[0])) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->unused[1])) { | ||
| return false; | ||
| } | ||
|
|
||
| // Read strings/arrays | ||
| if (!rz_buf_read_offset(obj->buf, &offset, bi->name, BOOT_NAME_SIZE)) { | ||
| return false; | ||
| } | ||
| if (!rz_buf_read_offset(obj->buf, &offset, bi->cmdline, BOOT_ARGS_SIZE)) { | ||
| return false; | ||
| } | ||
|
|
||
| for (i = 0; i < 8; i++) { | ||
| if (!rz_buf_read_le32_offset(obj->buf, &offset, &bi->id[i])) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (!rz_buf_read_offset(obj->buf, &offset, bi->extra_cmdline, BOOT_EXTRA_ARGS_SIZE)) { | ||
| return false; | ||
| } |
Member
There was a problem hiding this comment.
create a function. check the issue.
wargio
reviewed
Jan 20, 2026
Comment on lines
+118
to
+125
| if ((n = rz_str_ndup((char *)bi->name, BOOT_NAME_SIZE))) { | ||
| sdb_set(db, "name", n); | ||
| free(n); | ||
| } | ||
| if ((n = rz_str_ndup((char *)bi->cmdline, BOOT_ARGS_SIZE))) { | ||
| sdb_set(db, "cmdline", n); | ||
| free(n); | ||
| } |
Member
There was a problem hiding this comment.
this is a terrible idea if you don't sanitize the values.
Author
There was a problem hiding this comment.
Understood, I'll try a different approach.
wargio
reviewed
Jan 20, 2026
|
|
||
| for (i = 0; i < 8; i++) { | ||
| char key[16]; | ||
| snprintf(key, sizeof(key), "id.%d", i); |
Member
There was a problem hiding this comment.
Suggested change
| snprintf(key, sizeof(key), "id.%d", i); | |
| rz_strf(key, "id.%d", i); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RZ_APIfunction and struct this PR changes.Detailed description
This PR refactors the Android boot image (
bootimg) bin plugin to avoid using a packed struct for parsing the header.RZ_PACKEDfrom the boot image header definition inlibrz/bin/p/bin_bootimg.c.rz_buf_read_at().This improves portability and avoids potential alignment issues caused by packed structs.
AI disclosure: ChatGPT was used for guidance and review of the approach. All changes were implemented and verified manually.
Test plan
test/db/bins/bootimg/android_boot_min.imgtest/db/formats/bootimgTests cover:
q!)Android Boot Image(iI~type)headersection exists (iS~header)Closing issues
closes #5814