bootstd: android: avoid possible null pointer dereference
PATCH 1/1 bootstd: android: avoid possible null pointer dereference
- avb_slot_verify_data_free() doesn't check its data parameter
- out_data can be null if avb_slot_verify() fails to allocate memory
---
Another approach would be to fix avb_slot_verify_data_free() to check its paramter but I believe the goal is not to touch libavb to be closer to upstream.
--- boot/bootmeth_android.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
boot/bootmeth_android.c +4 -2
@@ -481,7 +481,8 @@ static int run_avb_verification(struct bootflow *bflow)if (result !=AVB_SLOT_VERIFY_RESULT_OK ) {printf ("Verification failed, reason: %s\n" ,str_avb_slot_error (result)); -avb_slot_verify_data_free (out_data); +if (out_data) +avb_slot_verify_data_free (out_data);return log_msg_ret ("avb verify" , -EIO ); } boot_state =AVB_GREEN ;
@@ -491,7 +492,8 @@ static int run_avb_verification(struct bootflow *bflow) result != AVB_SLOT_VERIFY_RESULT_ERROR_VERIFICATION) {printf ("Unlocked verification failed, reason: %s\n" ,str_avb_slot_error (result)); -avb_slot_verify_data_free (out_data); +if (out_data) +avb_slot_verify_data_free (out_data);return log_msg_ret ("avb verify unlocked" , -EIO ); } boot_state =AVB_ORANGE ;
Signature · 1 line
2.47.2
Hi Gary,
Thank you for the patch.
Quoted 4 lines · Gary Bisson
-
avb_slot_verify_data_free()doesn't check its data parameter
-out_datacan be null ifavb_slot_verify()fails to allocate memorySigned-off-by Gary Bisson <[email protected]>
Quoted 34 lines
---
Another approach would be to fixavb_slot_verify_data_free()to check its paramter but I believe the goal is not to touch libavb to be closer to upstream.--- boot/bootmeth_android.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)boot/bootmeth_android.c +4
-2@@ -481,7 +481,8 @@ static int run_avb_verification(struct bootflow *bflow)if (result !=AVB_SLOT_VERIFY_RESULT_OK ) {printf ("Verification failed, reason: %s\n" ,str_avb_slot_error (result)); -avb_slot_verify_data_free (out_data); +if (out_data) +avb_slot_verify_data_free (out_data);return log_msg_ret ("avb verify" , -EIO ); } boot_state =AVB_GREEN ;@@ -491,7 +492,8 @@ static int run_avb_verification(struct bootflow *bflow) result != AVB_SLOT_VERIFY_RESULT_ERROR_VERIFICATION) {printf ("Unlocked verification failed, reason: %s\n" ,str_avb_slot_error (result)); -avb_slot_verify_data_free (out_data); +if (out_data) +avb_slot_verify_data_free (out_data);return log_msg_ret ("avb verify unlocked" , -EIO ); } boot_state =AVB_ORANGE ;Signature · 1 line
2.47.2
Hi,
Quoted 4 lines · Gary Bisson
-
avb_slot_verify_data_free()doesn't check its data parameter
-out_datacan be null ifavb_slot_verify()fails to allocate memory
Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-dfu (u-boot-dfu)
[1/1] bootstd: android: avoid possible null pointer dereference
https://source.denx.de/u-boot/custodians/u-boot-dfu/-/commit/df50c821e75957113b93e45b363cb22c965e7a9b
--
Mattijs