summaryrefslogtreecommitdiff
path: root/cmd/avb.c
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2019-08-15 20:49:47 +0300
committerTom Rini <trini@konsulko.com>2019-10-31 14:22:53 +0300
commitbb43c2784704b79eaa383fe38255b2ecf73b46ff (patch)
treedbf75e655410f08dc43576c2a8a6a80d518c9c54 /cmd/avb.c
parent8f684b5a8b8351bf2d464609071ccd2de35c8773 (diff)
downloadu-boot-bb43c2784704b79eaa383fe38255b2ecf73b46ff.tar.xz
cmd: avb: Fix requested partitions list
The requested_partitions[] array should contain only boot partitions. Usually it's only 'boot' partition, as can be seen in [1]. Also, seems like the requested_partitions[] are only used when there is no 'vbmeta' partition [2], which is not a regular use-case. Make requested_partitions[] contain only 'boot' partition as it was supposed to be, and also make that array to be a local in do_avb_verify_part() function, as nobody else needs that. [1] https://android.googlesource.com/platform/external/avb/+/5fbb42a189aa/test/avb_slot_verify_unittest.cc#108 [2] https://android.googlesource.com/platform/external/avb/+/5fbb42a189aa/libavb/avb_slot_verify.c#1461 Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
Diffstat (limited to 'cmd/avb.c')
-rw-r--r--cmd/avb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/cmd/avb.c b/cmd/avb.c
index 5bc158252b..d4e8884328 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -15,11 +15,6 @@
#define AVB_BOOTARGS "avb_bootargs"
static struct AvbOps *avb_ops;
-static const char * const requested_partitions[] = {"boot",
- "system",
- "vendor",
- NULL};
-
int do_avb_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
unsigned long mmc_dev;
@@ -232,6 +227,7 @@ int do_avb_get_uuid(cmd_tbl_t *cmdtp, int flag,
int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
{
+ const char * const requested_partitions[] = {"boot", NULL};
AvbSlotVerifyResult slot_result;
AvbSlotVerifyData *out_data;
char *cmdline;