From 68ee26bb18e1b51f9ccb48dca0bfed8cd0169367 Mon Sep 17 00:00:00 2001 From: Nikolai Artemiev Date: Mon, 27 Feb 2023 10:24:42 +1100 Subject: lib/flashrom_drv.c: Use correct programmer name for programmer init Fix the call to `flashrom_programmer_init()` in `flashrom_get_wp()`. The programmer name and parameters should be passed separately, e.g: > flashrom_programmer_init("dummy", "emulate=VARIABLE_SIZE,...") However a string containing both the name and parameters was incorrectly used instead, e.g: > flashrom_programmer_init("dummy:emulate=VARIABLE_SIZE,...", "emulate=VARIABLE_SIZE,...") This was not noticed before because it did not cause issues if there were no parameters, e.g. if the programmer was just "host" or "internal" BUG=b:238694831,b:260531154 TEST=cros_run_unit_tests --board octopus --packages vboot_reference Change-Id: I4774a82258acbb8be2b430351ccef203e26e6b27 Signed-off-by: Nikolai Artemiev Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4290837 Reviewed-by: Yu-Ping Wu Reviewed-by: Edward O'Callaghan Commit-Queue: Yu-Ping Wu --- host/lib/flashrom_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/host/lib/flashrom_drv.c b/host/lib/flashrom_drv.c index 8acd3be7..ff31e149 100644 --- a/host/lib/flashrom_drv.c +++ b/host/lib/flashrom_drv.c @@ -252,7 +252,7 @@ err_init: return r; } -enum wp_state flashrom_get_wp(const char *programmer, int verbosity) +enum wp_state flashrom_get_wp(const char *prog_with_params, int verbosity) { enum wp_state r = WP_ERROR; @@ -263,8 +263,8 @@ enum wp_state flashrom_get_wp(const char *programmer, int verbosity) struct flashrom_wp_cfg *cfg = NULL; - char *tmp_programmer, *params; - char *tmp = flashrom_extract_params(programmer, &tmp_programmer, + char *programmer, *params; + char *tmp = flashrom_extract_params(prog_with_params, &programmer, ¶ms); flashrom_set_log_callback((flashrom_log_callback *)&flashrom_print_cb); -- cgit v1.2.1