]> git.baikalelectronics.ru Git - uboot.git/commit
libavb: Handle wrong hashtree_error_mode in avb_append_options()
authorIevgen Maliarenko <ievgen.maliarenko@globallogic.com>
Tue, 14 Aug 2018 00:43:03 +0000 (02:43 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 17:19:53 +0000 (13:19 -0400)
commit527814adbec506222b057b28d8d4682bb3e85e7b
treeab1debcb409226d1d56db57dcbc8dd0e15cff8b0
parentf1909a13e2cc09618443f6ce3d468fcd1c0f96e5
libavb: Handle wrong hashtree_error_mode in avb_append_options()

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 <ievgen.maliarenko@globallogic.com>
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>
lib/libavb/avb_cmdline.c