diff options
| author | Nikolai Artemiev <nartemiev@google.com> | 2023-02-27 10:24:42 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-29 08:19:41 +0000 |
| commit | 84691200bf9a7a2f4503d9aba1565c898b0827d0 (patch) | |
| tree | 53a16088049e9c2db5b47856a0d1e32b9acd311c | |
| parent | b6538a042f0c359a94be7dbf52cb8d51d4eb5cc2 (diff) | |
| download | vboot-84691200bf9a7a2f4503d9aba1565c898b0827d0.tar.gz | |
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
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4290837
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4380998
Commit-Queue: Cheng Yueh <cyueh@chromium.org>
Auto-Submit: Phoebe Wang <phoebewang@chromium.org>
Tested-by: Phoebe Wang <phoebewang@chromium.org>
Reviewed-by: Cheng Yueh <cyueh@chromium.org>
| -rw-r--r-- | host/lib/flashrom_drv.c | 6 |
1 files 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); |