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

lib: avb: reduce write rollback index operations 

The optee is used to storage security data in U-Boot, and a file
which occupy 16KB is created when write a rollback index. But the
security space is only 512KB, the sapce is not enough when write
too many items.

And here we write rollback index 32 times, but the avb only use
rollback_index_location 0 to verify the rollback index with vbmeta.
So just get the rollback_index_location 0 in this process.

Test:
	fastboot getvar at-vboot-state

Error log:
	TEEC: reference out of data: -1
	TEEC: Not enough space available in secure storage!

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Id69b852553a4ef9111dabe6f23e25038b0928bb3
This commit is contained in:
Jason Zhu 2021-01-30 10:23:15 +08:00 committed by Jianhong Chen
parent 72f40a61fa
commit 926664c9a0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/avb/rk_avb_user/rk_avb_ops_user.c
View File

@ -309,7 +309,6 @@ int rk_avb_read_all_rollback_index(char *buffer)
uint64_t stored_rollback_index = 0;
AvbIOResult io_ret;
char temp[ROLLBACK_MAX_SIZE] = {0};
int n;
ops = avb_ops_user_new();
if (ops == NULL) {
@ -317,19 +316,17 @@ int rk_avb_read_all_rollback_index(char *buffer)
return -1;
}
for (n = 0; n < AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS; n++) {
io_ret = ops->read_rollback_index(
ops, n, &stored_rollback_index);
if (io_ret != AVB_IO_RESULT_OK)
goto out;
snprintf(temp, sizeof(int) + 1, "%d", n);
strncat(buffer, temp, ROLLBACK_MAX_SIZE);
strncat(buffer, ":", 1);
snprintf(temp, sizeof(uint64_t) + 1, "%lld",
stored_rollback_index);
strncat(buffer, temp, ROLLBACK_MAX_SIZE);
strncat(buffer, ",", 1);
}
/* Actually the rollback_index_location 0 is used. */
io_ret = ops->read_rollback_index(ops, 0, &stored_rollback_index);
if (io_ret != AVB_IO_RESULT_OK)
goto out;
snprintf(temp, sizeof(int) + 1, "%d", 0);
strncat(buffer, temp, ROLLBACK_MAX_SIZE);
strncat(buffer, ":", 1);
snprintf(temp, sizeof(uint64_t) + 1, "%lld",
stored_rollback_index);
strncat(buffer, temp, ROLLBACK_MAX_SIZE);
strncat(buffer, ",", 1);
io_ret =
ops->read_rollback_index(ops,