Reviewed-by: Igor Opaniuk <[email protected]> On 14 August 2018 at 03:43, Eugeniu Rosca <[email protected]> wrote: > From: Ievgen Maliarenko <[email protected]> > > Exit with AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_ARGUMENT > when hashtree_error_mode value passed to avb_append_options() > is unknown (not from AvbHashtreeErrorMode enum). > > Otherwise, default value is not handled in the > switch(hashtree_error_mode), which causes below compile warning: > > lib/libavb/avb_cmdline.c: In function ‘avb_append_options’: > lib/libavb/avb_cmdline.c:354:13: warning: ‘dm_verity_mode’ may be used > uninitialized in this function [-Wmaybe-uninitialized] > new_ret = avb_replace( > ~~~~~~~~^~~~~~~~~~~~~~ > slot_data->cmdline, "$(ANDROID_VERITY_MODE)", dm_verity_mode); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > lib/libavb/avb_cmdline.c:363:8: warning: ‘verity_mode’ may be used > uninitialized in this function [-Wmaybe-uninitialized] > if (!cmdline_append_option( > ^~~~~~~~~~~~~~~~~~~~~~ > slot_data, "androidboot.veritymode", verity_mode)) { > > Signed-off-by: Ievgen Maliarenko <[email protected]> > Signed-off-by: Eugeniu Rosca <[email protected]> > --- > lib/libavb/avb_cmdline.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/lib/libavb/avb_cmdline.c b/lib/libavb/avb_cmdline.c > index 91a6615c740d..d24669927203 100644 > --- a/lib/libavb/avb_cmdline.c > +++ b/lib/libavb/avb_cmdline.c > @@ -331,6 +331,9 @@ AvbSlotVerifyResult avb_append_options( > verity_mode = "logging"; > dm_verity_mode = "ignore_corruption"; > break; > + default: > + ret = AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_ARGUMENT; > + goto out; > } > new_ret = avb_replace( > slot_data->cmdline, "$(ANDROID_VERITY_MODE)", dm_verity_mode); > -- > 2.18.0 >
-- Regards, Igor Opaniuk _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
