cmd: avb: free partition buffer upon verify completion
PATCH 1/1 cmd: avb: free partition buffer upon verify completion
Allows to run 'avb verify' multiple times which can be useful after a failure to be able to re-flash the partition and try again.
---
Hi,
This was added because of the following scenario:
1- fastboot flash boot boot.img
2- avb verify
-> fails because vbmeta wasn't updated
3- fastboot flash vbmeta vbmeta.img
4- avb verify
-> fails because it can't allocate memory as previous buffer wasn't
freed
Let me know if you have any questions.
Regards,
Gary
--- cmd/avb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
cmd/avb.c +8 -0
@@ -312,6 +312,14 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag,printf ("Unknown error occurred\n" ); } +/* Free image buffers now that verification is complete */ +if (slot_result !=AVB_SLOT_VERIFY_RESULT_ERROR_OOM ) { +int i; +for (i =0 ; i < (int )out_data->num_loaded_partitions; i++) +if (out_data->loaded_partitions[i].data) +free (out_data->loaded_partitions[i].data); + } +return res; }
Signature · 1 line
2.26.2
PATCH 1/1 cmd: avb: free partition buffer upon verify completion
Hi Gary,
Thanks for the patch and sorry for a late reply.
Quoted 30 lines · Gary Bisson
Allows to run 'avb verify' multiple times which can be useful after a failure to be able to re-flash the partition and try again.
Signed-off-by Gary Bisson <[email protected]>---
Hi,This was added because of the following scenario:
1- fastboot flash boot boot.img
2- avb verify
-> fails because vbmeta wasn't updated
3- fastboot flash vbmeta vbmeta.img
4- avb verify
-> fails because it can't allocate memory as previous buffer wasn't
freedLet me know if you have any questions.
Regards,
Gary--- cmd/avb.c | 8 ++++++++ 1 file changed, 8 insertions(+)cmd/avb.c +0
-0
cmd/avb.c int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, · line 316
Quoted 5 lines
cmd/avb.c +2
-0@@ -312,6 +312,14 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag,printf ("Unknown error occurred\n" ); } +/* Free image buffers now that verification is complete */ +if (slot_result !=AVB_SLOT_VERIFY_RESULT_ERROR_OOM ) {
Freeing out_data can be done not only when res isAVB_SLOT_VERIFY_RESULT_ERROR_OOM.
For example, in the line 1196 in [1]:
AvbSlotVerifyResult sub_ret = avb_append_options(ops,
slot_data,
&toplevel_vbmeta,
algorithm_type,
hashtree_error_mode);
if (sub_ret != AVB_SLOT_VERIFY_RESULT_OK) {
ret = sub_ret;
goto fail;
}cmd/avb.c int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, · line 320
Quoted 4 lines
cmd/avb.c +4
-0+int i; +for (i =0 ; i < (int )out_data->num_loaded_partitions; i++) +if (out_data->loaded_partitions[i].data) +free (out_data->loaded_partitions[i].data);
It's better to use avb_slot_verify_data_free() for the whole out_data instead for proper cleanup. Check how it's done in unittests for libavb [2].
Quoted 8 lines
cmd/avb.c +2
-1+ } +return res; } --2.26.2
[1] lib/libavb/avb_slot_verify.c
[2] https://android.googlesource.com/platform/external/avb/+/refs/tags/android-9.0.0_r37/test/avb_slot_verify_unittest.cc#156
Signature · 8 lines
Best regards - Freundliche Gr?sse - Meilleures salutations Igor Opaniuk mailto: igor.opaniuk at gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk
PATCH 1/1 cmd: avb: free partition buffer upon verify completion
Hi Igor,
Quoted 3 lines · Igor Opaniuk
Hi Gary,
Thanks for the patch and sorry for a late reply.
No problem.
Quoted 42 lines
Quoted 30 lines · Gary Bisson
Allows to run 'avb verify' multiple times which can be useful after a failure to be able to re-flash the partition and try again.
Signed-off-by Gary Bisson <[email protected]>---
Hi,This was added because of the following scenario:
1- fastboot flash boot boot.img
2- avb verify
-> fails because vbmeta wasn't updated
3- fastboot flash vbmeta vbmeta.img
4- avb verify
-> fails because it can't allocate memory as previous buffer wasn't
freedLet me know if you have any questions.
Regards,
Gary--- cmd/avb.c | 8 ++++++++ 1 file changed, 8 insertions(+)cmd/avb.c +0
-0cmd/avb.c int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, · line 316
Quoted 5 lines
cmd/avb.c +2
-0@@ -312,6 +312,14 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag,printf ("Unknown error occurred\n" ); } +/* Free image buffers now that verification is complete */ +if (slot_result !=AVB_SLOT_VERIFY_RESULT_ERROR_OOM ) {Freeing
out_datacan be done not only when res isAVB_SLOT_VERIFY_RESULT_ERROR_OOM.
For example, in the line 1196 in [1]:AvbSlotVerifyResult
sub_ret= avb_append_options(ops,
Quoted 8 lines
slot_data,
&toplevel_vbmeta,
algorithm_type,
hashtree_error_mode);
if (sub_ret != AVB_SLOT_VERIFY_RESULT_OK) {
ret = sub_ret;
goto fail;
}Indeed.
Quoted 7 lines
cmd/avb.c int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, · line 320
Quoted 4 lines
cmd/avb.c +4
-0+int i; +for (i =0 ; i < (int )out_data->num_loaded_partitions; i++) +if (out_data->loaded_partitions[i].data) +free (out_data->loaded_partitions[i].data);It's better to use
avb_slot_verify_data_free()for the wholeout_datainstead for proper cleanup. Check how it's done in unittests for libavb [2].
I'll check it out and offer a v2. Thanks for your feedback.
Regards,
Gary