diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2020-06-29 17:15:25 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-17 00:18:28 +0000 |
| commit | d00425c2f90c81ee63bcab09269e83af13ed33c8 (patch) | |
| tree | 137423a85d1a45ae909366c6b9e4aea696584eb7 | |
| parent | 6f181321c0a3268f59394863239d6c774c754d6e (diff) | |
| download | chrome-ec-d00425c2f90c81ee63bcab09269e83af13ed33c8.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>
(cherry picked from commit 3a838d11ae131526b1524a03789f11300f095c9b)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3128746
Reviewed-by: Zhuohao Lee <zhuohao@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 73e6deb0e4..773b2ef956 100755 --- a/util/ecst.c +++ b/util/ecst.c @@ -389,7 +389,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], |