diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2023-02-21 10:16:14 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-23 07:23:36 +0000 |
| commit | 529821b48d272d2d8ad47cb04f63afb5e57c8207 (patch) | |
| tree | 9a698f1351a1362d026ae35e96f2b9d721a40dcb | |
| parent | d42a89d626b75511b057061cfc41e9dde8db623d (diff) | |
| download | vboot-stabilize-15359.B.tar.gz | |
futility/cmd_gbb_utility.c: Allow OR'ing new GBB flagsstabilize-15361.Bstabilize-15359.B
It maybe the case that the caller wishes to not clobber
the current flags set and merely just OR on the new bits.
BUG=b:270074866
TEST=```
# futility gbb --flash --get --flags
# futility gbb --flash --set --flags=(+|-)0x1
# futility gbb --flash --get --flags
as expected.
```
Change-Id: Ibd56dff986d2075b7b220c531e66b224d488b6e6
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4273505
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
| -rw-r--r-- | futility/cmd_gbb_utility.c | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c index 08b6591f..916f4eb4 100644 --- a/futility/cmd_gbb_utility.c +++ b/futility/cmd_gbb_utility.c @@ -59,7 +59,7 @@ static void print_help(int argc, char *argv[]) FLASH_ARG_HELP " -o, --output=FILE \tNew file name for ouptput.\n" " --hwid=HWID \tThe new hardware id to be changed.\n" - " --flags=FLAGS \tThe new (numeric) flags value.\n" + " --flags=FLAGS \tThe new (numeric) flags value or +/- diff value.\n" " -k, --rootkey=FILE \tFile name of new Root Key.\n" " -b, --bmpfv=FILE \tFile name of new Bitmap FV.\n" " -r --recoverykey=FILE\tFile name of new Recovery Key.\n" @@ -451,6 +451,29 @@ static int write_to_flash(struct updater_config *cfg, uint8_t *outbuf, #endif /* USE_FLASHROM */ } +static int parse_flag_value(const char *s, vb2_gbb_flags_t *val) +{ + int sign = 0; + + if (!strlen(s)) + return -1; + + if (s[0] == '+') + sign = 1; + else if (s[0] == '-') + sign = 2; + + const char *ss = !sign ? s : &s[1]; + char *e = NULL; + *val = strtoul(ss, &e, 0); + if (e && *e) { + fprintf(stderr, "ERROR: invalid flags value: %s\n", ss); + return -1; + } + + return sign; +} + static int do_gbb(int argc, char *argv[]) { enum do_what_now { DO_GET, DO_SET, DO_CREATE } mode = DO_GET; @@ -756,17 +779,17 @@ static int do_gbb(int argc, char *argv[]) } if (opt_flags) { - char *e = NULL; - uint32_t val; - val = (uint32_t) strtoul(opt_flags, &e, 0); - if (e && *e) { - fprintf(stderr, - "ERROR: invalid flags value: %s\n", - opt_flags); + vb2_gbb_flags_t val; + const int flag_sign = parse_flag_value(opt_flags, &val); + if (flag_sign < 0) { errorcnt++; break; } - gbb->flags = val; + if (flag_sign > 0) + /* flag_sign := 1 => +ve and flag_sign := 2 => -ve. */ + gbb->flags = flag_sign == 1 ? (gbb->flags | val) : (gbb->flags & ~val); + else + gbb->flags = val; } if (opt_rootkey) { |