qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: avb: use sysmem alloc to load image 

Using malloc buffer to load image makes CONFIG_SYS_MALLOC_LEN must be
large enough, sysmem alloc is a better way.

Change-Id: I24e2b86c53b8d3307c0d155fc37cb499c321e1c6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-05-14 19:50:30 +08:00 committed by Jianhong Chen
parent 6184121cdc
commit 89151b4aad
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/avb/libavb/avb_slot_verify.c
View File

@ -21,7 +21,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include <common.h>
#include <sysmem.h>
#include <android_avb/avb_slot_verify.h>
#include <android_avb/avb_chain_partition_descriptor.h>
#include <android_avb/avb_cmdline.h>
@ -107,7 +108,7 @@ static AvbSlotVerifyResult load_full_partition(AvbOps* ops,
/* Allocate and copy the partition. */
if (!*out_image_preloaded) {
*out_image_buf = avb_malloc(image_size);
*out_image_buf = sysmem_alloc(MEMBLK_ID_AVB_ANDROID, image_size);
if (*out_image_buf == NULL) {
return AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
}
@ -369,7 +370,7 @@ out:
fail:
if (image_buf != NULL && !image_preloaded) {
avb_free(image_buf);
sysmem_free((phys_addr_t)image_buf);
}
return ret;
}
@ -449,7 +450,7 @@ static AvbSlotVerifyResult load_requested_partitions(
out:
/* Free the current buffer if any. */
if (image_buf != NULL && !image_preloaded) {
avb_free(image_buf);
sysmem_free((phys_addr_t)image_buf);
}
/* Buffers that are already saved in slot_data will be handled by the caller
* even on failure. */
@ -1295,7 +1296,7 @@ void avb_slot_verify_data_free(AvbSlotVerifyData* data) {
avb_free(loaded_partition->partition_name);
}
if (loaded_partition->data != NULL && !loaded_partition->preloaded) {
avb_free(loaded_partition->data);
sysmem_free((phys_addr_t)loaded_partition->data);
}
}
avb_free(data->loaded_partitions);