dbootimg: Fix sigsegv while updating kernel with no dtb #6
Conversation
This file contains 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
loicpoulain
requested changes
Aug 24, 2018
tools/dbootimg/src/dbootimg.c
Outdated
| void *old_kernel, *dtb, *ptr; | ||
| int diff; | ||
|
|
||
| page_sz = le32_to_cpu(old_aboot->page_size); | ||
| old_kernel = aboot_get_kernel(old_aboot); | ||
| kernel_sz = kernelgz_size(kernel); | ||
| dtb = aboot_get_dtb(old_aboot); | ||
|
|
||
| if (kernel_has_appended_dtb(kernel)){ |
There was a problem hiding this comment.
we don't really care if the new kernel has appended dtb, we just want to avoid error if the current one does not have dtb.
dtb = aboot_get_dtb(old_aboot);
dtb_sz = dtb ? dtb_size(dtb) : 0;
Trying to update a kernel with no appended dtb resulted in: root@qt5506:~# dbootimg /dev/disk/by-partlabel/boot -u kernel /boot/Image.gz DTB not found in boot image [ 2130.770995] audit: type=1701 audit(1533805111.476:2): auid=4294967295 uid=0 gid=0 ses=4294967295 pid=3453 comm="dbootimg" exe="/usr/bin/dbootimg" sig=11 res=1 Segmentation fault (core dumped) This patch allows upding the dtb IIF the old image contained an appended dtb. Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
|
Changes applied as requested. Thanks! |
loicpoulain
approved these changes
Sep 24, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Trying to update a kernel with no appended dtb resulted in:
root@qt5506:~# dbootimg /dev/disk/by-partlabel/boot -u kernel /boot/Image.gz
DTB not found in boot image
[ 2130.770995] audit: type=1701 audit(1533805111.476:2): auid=4294967295 uid=0 gid=0 ses=4294967295 pid=3453 comm="dbootimg" exe="/usr/bin/dbootimg" sig=11 res=1
Segmentation fault (core dumped)
This patch allows upding the dtb IIF the old image contained an appended
dtb.
Signed-off-by: Ricardo Ribalda Delgado [email protected]