From 217ee70388b33bbed262a8cdf2232b335ec0a380 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Wed, 1 Mar 2023 01:34:18 +0000 Subject: futility: updater: Fix platform_ver property on error The platform_ver property was expected to be within 0..INT_MAX before the implementation changed from mosys to crossystem (CL:4029537). So we should return 0 instead of -1 on error. BUG=b:271115449 TEST=make; run test BRANCH=None Change-Id: I772ff53a4a13e17e6cfe8099768dba64b8736ec5 Signed-off-by: Hung-Te Lin Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4297882 Commit-Queue: Yu-Ping Wu Reviewed-by: Yu-Ping Wu --- futility/updater_dut.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/futility/updater_dut.c b/futility/updater_dut.c index 102859ae..6cb03727 100644 --- a/futility/updater_dut.c +++ b/futility/updater_dut.c @@ -9,6 +9,7 @@ #ifdef HAVE_CROSID #include #endif +#include #include "crossystem.h" #include "updater.h" @@ -111,7 +112,13 @@ static int dut_get_wp_hw(struct updater_config *cfg) static int dut_get_platform_version(struct updater_config *cfg) { - return dut_get_property_int("board_id", cfg); + long rev = dut_get_property_int("board_id", cfg); + /* Assume platform version = 0 on error. */ + if (rev < 0) + rev = 0; + if (rev > INT_MAX) + rev = INT_MAX; + return rev; } /* Helper function to return host software write protection status. */ -- cgit v1.2.1