avb: add support for named persistent values
PATCH v6 1/1 avb: add support for named persistent values
AVB 2.0 spec. revision 1.1 introduces support for named persistent values that must be tamper evident and allows AVB to store arbitrary key-value pairs [1].
Introduce implementation of two additional AVB operations read_persistent_value()/write_persistent_value() for retrieving/storing named persistent values.
Correspondent pull request in the OP-TEE OS project repo [2].
[1]: https://android.googlesource.com/platform/external/avb/+/android-9.0.0_r22
[2]: https://github.com/OP-TEE/optee_os/pull/2699
---
v6:
- Add R-b tag
v5:
- fix failing test on sandbox_flattree target
- keep all defined globally variables in a driver-private data struct, which permits to probe multiple tee sandbox devices
v4:
- extend tee sandbox tee driver to support persistent values
- fix/re-test avb_persistent test on sandbox configuration
v3:
- fix possible mem lick in avb_read_persistent/avb_write_persistent
- add additional sanity checks
- cover avb read_pvalue/write_pvalue commands with python tests
v2:
- fix output format for avb read_pvalue/write_pvalue commands
- fix issue with named value buffer size
cmd/avb.c | 78 +++++++++++++++++++++++ common/avb_verify.c | 125 +++++++++++++++++++++++++++++++++++++ drivers/tee/sandbox.c | 121 +++++++++++++++++++++++++++++------ include/sandboxtee.h | 15 ++++- include/tee.h | 2 + include/tee/optee_ta_avb.h | 16 +++++ test/py/tests/test_avb.py | 16 +++++ 7 files changed, 351 insertions(+), 22 deletions(-)
cmd/avb.c +78 -0
@@ -340,6 +340,76 @@ int do_avb_is_unlocked(cmd_tbl_t *cmdtp, int flag,return CMD_RET_FAILURE ; } +int do_avb_read_pvalue (cmd_tbl_t *cmdtp,int flag,int argc, +char *const argv[]) +{ +const char *name; +size_t bytes; +size_t bytes_read; +void *buffer; +char *endp; + +if (!avb_ops) { +printf ("AVB 2.0 is not initialized, run 'avb init' first\n" ); +return CMD_RET_FAILURE ; + } + +if (argc !=3 ) +return CMD_RET_USAGE ; + + name = argv[1 ]; + bytes =simple_strtoul (argv[2 ], &endp,10 ); +if (*endp && *endp !='\n' ) +return CMD_RET_USAGE ; + + buffer =malloc (bytes); +if (!buffer) +return CMD_RET_FAILURE ; + +if (avb_ops->read_persistent_value (avb_ops, name, bytes, buffer, + &bytes_read) ==AVB_IO_RESULT_OK ) { +printf ("Read %ld bytes, value = %s\n" , bytes_read, + (char *)buffer); +free (buffer); +return CMD_RET_SUCCESS ; + } + +printf ("Failed to read persistent value\n" ); + +free (buffer); + +return CMD_RET_FAILURE ; +} + +int do_avb_write_pvalue (cmd_tbl_t *cmdtp,int flag,int argc, +char *const argv[]) +{ +const char *name; +const char *value; + +if (!avb_ops) { +printf ("AVB 2.0 is not initialized, run 'avb init' first\n" ); +return CMD_RET_FAILURE ; + } + +if (argc !=3 ) +return CMD_RET_USAGE ; + + name = argv[1 ]; + value = argv[2 ]; + +if (avb_ops->write_persistent_value (avb_ops, name,strlen (value) +1 , + (const uint8_t *)value) == +AVB_IO_RESULT_OK ) { +printf ("Wrote %ld bytes\n" ,strlen (value) +1 ); +return CMD_RET_SUCCESS ; + } + +printf ("Failed to write persistent value\n" ); + +return CMD_RET_FAILURE ; +} +static cmd_tbl_t cmd_avb[] = {U_BOOT_CMD_MKENT (init,2 ,0 , do_avb_init,"" ,"" ),U_BOOT_CMD_MKENT (read_rb,2 ,0 , do_avb_read_rb,"" ,"" ),
@@ -350,6 +420,10 @@ static cmd_tbl_t cmd_avb[] = {U_BOOT_CMD_MKENT (read_part_hex,4 ,0 , do_avb_read_part_hex,"" ,"" ),U_BOOT_CMD_MKENT (write_part,5 ,0 , do_avb_write_part,"" ,"" ),U_BOOT_CMD_MKENT (verify,1 ,0 , do_avb_verify_part,"" ,"" ), +#ifdef CONFIG_OPTEE_TA_AVB +U_BOOT_CMD_MKENT (read_pvalue,3 ,0 , do_avb_read_pvalue,"" ,"" ), + U_BOOT_CMD_MKENT(write_pvalue, 3, 0, do_avb_write_pvalue, "", ""), +#endif };static int do_avb (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[])
@@ -384,6 +458,10 @@ U_BOOT_CMD( " partition <partname> and print to stdout\n" "avb write_part <partname> <offset> <num> <addr> - write <num> bytes to\n" " <partname> by <offset> using data from <addr>\n" +#ifdef CONFIG_OPTEE_TA_AVB + "avb read_pvalue <name> <bytes> - read a persistent value <name>\n" + "avb write_pvalue <name> <value> - write a persistent value <name>\n" +#endif"avb verify - run verification process using hash data\n" " from vbmeta structure\n" );
common/avb_verify.c +125 -0
143 lines not on this page · raw message
drivers/tee/sandbox.c +102 -19
210 lines not on this page · raw message
include/sandboxtee.h +12 -3
@@ -6,16 +6,25 @@#ifndef __SANDBOXTEE_H#define __SANDBOXTEE_H +#include <search.h> +#include <tee/optee_ta_avb.h> +/** * struct sandbox_tee_state - internal state of the sandbox TEE -* @session: current open session -* @num_shms: number of registered shared memory objects -* @ta: Trusted Application of current session +* @session: current open session +* @num_shms: number of registered shared memory objects +* @ta: Trusted Application of current session +* @ta_avb_rollback_indexes TA avb rollback indexes storage +* @ta_avb_lock_state TA avb lock state storage +* @pstorage_htab named persistent values storage */ struct sandbox_tee_state {u32 session;int num_shms;void *ta; +u64 ta_avb_rollback_indexes[TA_AVB_MAX_ROLLBACK_LOCATIONS ]; +u32 ta_avb_lock_state; +struct hsearch_data pstorage_htab; };#endif /*__SANDBOXTEE_H*/
include/tee.h +2 -0
@@ -43,7 +43,9 @@#define TEE_ERROR_COMMUNICATION 0xffff000e#define TEE_ERROR_SECURITY 0xffff000f#define TEE_ERROR_OUT_OF_MEMORY 0xffff000c +#define TEE_ERROR_OVERFLOW 0xffff300f#define TEE_ERROR_TARGET_DEAD 0xffff3024 +#define TEE_ERROR_STORAGE_NO_SPACE 0xffff3041#define TEE_ORIGIN_COMMS 0x00000002#define TEE_ORIGIN_TEE 0x00000003
include/tee/optee_ta_avb.h +16 -0
@@ -45,4 +45,20 @@*/ #define TA_AVB_CMD_WRITE_LOCK_STATE 3 +/* +* Reads a persistent value corresponding to the given name. +* +* in params[0].u.memref: persistent value name +* out params[1].u.memref: read persistent value buffer +*/ +#define TA_AVB_CMD_READ_PERSIST_VALUE 4 + +/* +* Writes a persistent value corresponding to the given name. +* +* in params[0].u.memref: persistent value name +* in params[1].u.memref: persistent value buffer to write +*/ +#define TA_AVB_CMD_WRITE_PERSIST_VALUE 5 +#endif /* __TA_AVB_H */
test/py/tests/test_avb.py +16 -0
@@ -116,3 +116,19 @@ def test_avb_mmc_read(u_boot_console): response = u_boot_console.run_command('cmp 0x%x 0x%x 40' % (temp_addr, temp_addr2)) assert response.find('64 word') + + + at pytest.mark.buildconfigspec('cmd_avb') + at pytest.mark.buildconfigspec('optee_ta_avb') +def test_avb_persistent_values(u_boot_console): + """Test reading/writing persistent storage to avb + """ + + response = u_boot_console.run_command('avb init %s' % str(mmc_dev)) + assert response == '' + + response = u_boot_console.run_command('avb write_pvalue test value_value') + assert response == 'Wrote 12 bytes' + + response = u_boot_console.run_command('avb read_pvalue test 12') + assert response == 'Read 12 bytes, value = value_value'
Signature · 1 line
2.17.1
PATCH v6 1/1 avb: add support for named persistent values
Quoted 8 lines · Igor Opaniuk
AVB 2.0 spec. revision 1.1 introduces support for named persistent values that must be tamper evident and allows AVB to store arbitrary key-value pairs [1].
Introduce implementation of two additional AVB operations read_persistent_value()/write_persistent_value() for retrieving/storing named persistent values.
Quoted 8 lines
Correspondent pull request in the OP-TEE OS project repo [2].
[1]: https://android.googlesource.com/platform/external/avb/+/android-9.0.0_r22
[2]: https://github.com/OP-TEE/optee_os/pull/2699Reviewed-by Simon Glass <[email protected]>Reviewed-by Sam Protsenko <[email protected]>Signed-off-by Igor Opaniuk <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190427/85838e75/attachment.sig>