diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2020-06-29 17:15:25 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-20 03:56:07 +0000 |
| commit | 65ce016544a8b6c015cd538d2ab388f34dd09989 (patch) | |
| tree | cd5c82ef21ceb4248aa892f3007090256c7ba986 | |
| parent | baa4c93ff92ee15ab310f04e928323371ba192ca (diff) | |
| download | chrome-ec-65ce016544a8b6c015cd538d2ab388f34dd09989.tar.gz | |
util/ecst: Make sure that copying back arguments doesn't exceed MAX_ARGS
Newer gcc than we have in CrOS shows a non-helpful error message:
util/ecst.c: In function 'main':
util/ecst.c:398:7: error: 'strncpy' output may be truncated copying
100 bytes from a string of length 9999 [-Werror=stringop-truncation]
398 | strncpy(hdr_args[arg_ind++],
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
399 | tmp_hdr_args[tmp_ind],
| ~~~~~~~~~~~~~~~~~~~~~~
400 | ARG_SIZE);
| ~~~~~~~~~
In the end it's about gcc not being able to ensure that hdr_args[]
doesn't overflow.
BUG=none
BRANCH=none
TEST=gcc 9.3 as shipped with debian sid compiles ecst without error
Change-Id: I2c30cdfaac0305ea4e4c19477469bcf497469caa
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2273240
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3105732
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rwxr-xr-x | util/ecst.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/ecst.c b/util/ecst.c index 328587e8d9..a46d444817 100755 --- a/util/ecst.c +++ b/util/ecst.c @@ -391,7 +391,8 @@ int main(int argc, char *argv[]) /* Copy back the restored arguments. */ for (tmp_ind = 0; - tmp_ind < tmp_arg_num; + (tmp_ind < tmp_arg_num) && + (arg_ind < MAX_ARGS); tmp_ind++) { strncpy(hdr_args[arg_ind++], tmp_hdr_args[tmp_ind], |