diff options
| author | Winter Wang <wente.wang@nxp.com> | 2016-11-21 18:22:56 +0800 |
|---|---|---|
| committer | Winter Wang <wente.wang@nxp.com> | 2016-11-21 18:31:49 +0800 |
| commit | 927e32925f456345d3d3daa3172a5dea11cabe8f (patch) | |
| tree | 1e73740d1d7b76ee05a1d4e3c404a61e8f01cd39 | |
| parent | 244c4dbc04dec866eff912b0aea8d83eb07be0ee (diff) | |
| download | u-boot-imx-927e32925f456345d3d3daa3172a5dea11cabe8f.zip u-boot-imx-927e32925f456345d3d3daa3172a5dea11cabe8f.tar.gz u-boot-imx-927e32925f456345d3d3daa3172a5dea11cabe8f.tar.bz2 | |
libavb: do not touch a/b metadata in UNLOCK
avb should not touch a/b metadata in UNLOCK state,
otherwise if verifies fail, a/b metadata is set to
unbootable and leads to boot from an unbootable slot.
Change-Id: I6638e4b1b5c154b01272f1a1c81302b443e0b2d5
Signed-off-by: Winter Wang <wente.wang@nxp.com>
| -rw-r--r-- | lib/libavb/avb_ab_flow.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/libavb/avb_ab_flow.c b/lib/libavb/avb_ab_flow.c index 851878a..bcd6740 100644 --- a/lib/libavb/avb_ab_flow.c +++ b/lib/libavb/avb_ab_flow.c @@ -202,6 +202,7 @@ AvbABFlowResult avb_ab_flow(AvbOps* ops, AvbABFlowResult ret; AvbABData ab_data, ab_data_orig; size_t slot_index_to_boot, n; + bool is_device_unlocked; AvbIOResult io_ret; io_ret = load_metadata(ops, &ab_data, &ab_data_orig); @@ -311,6 +312,20 @@ AvbABFlowResult avb_ab_flow(AvbOps* ops, } out: + /* do not touch metadata in UNLOCK state */ + io_ret = ops->read_is_device_unlocked(ops, &is_device_unlocked); + if (io_ret == AVB_IO_RESULT_ERROR_OOM) { + ret = AVB_AB_FLOW_RESULT_ERROR_OOM; + goto fail; + } else if (io_ret != AVB_IO_RESULT_OK) { + ret = AVB_SLOT_VERIFY_RESULT_ERROR_IO; + avb_error("Error getting device state.\n"); + goto fail; + } + if (is_device_unlocked) + goto ret; + +fail: io_ret = save_metadata_if_changed(ops, &ab_data, &ab_data_orig); if (io_ret != AVB_IO_RESULT_OK) { if (io_ret == AVB_IO_RESULT_ERROR_OOM) { @@ -324,6 +339,7 @@ out: } } +ret: for (n = 0; n < 2; n++) { if (slot_data[n] != NULL) { avb_slot_verify_data_free(slot_data[n]); |