From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, Phil Yang <phil.yang@arm.com>,
Lijian Zhang <lijian.zhang@arm.com>,
Sunil Kumar Kori <skori@marvell.com>,
Jerin Jacob <jerinj@marvell.com>
Subject: [dpdk-dev] [PATCH 8/8] trace: fix build with gcc 10
Date: Sun, 3 May 2020 22:31:35 +0200 [thread overview]
Message-ID: <20200503203135.6493-9-david.marchand@redhat.com> (raw)
In-Reply-To: <20200503203135.6493-1-david.marchand@redhat.com>
From: Phil Yang <phil.yang@arm.com>
Prevent from writing beyond the allocated memory.
GCC 10 compiling output:
eal_common_trace_utils.c: In function 'eal_trace_dir_args_save':
eal_common_trace_utils.c:290:24: error: '__builtin___sprintf_chk' \
may write a terminating nul past the end of the destination \
[-Werror=format-overflow=]
290 | sprintf(dir_path, "%s/", optarg);
| ^
Fixes: 8af866df8d8c ("trace: add trace directory configuration parameter")
Signed-off-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Lijian Zhang <lijian.zhang@arm.com>
Tested-by: Lijian Zhang <lijian.zhang@arm.com>
Acked-by: Sunil Kumar Kori <skori@marvell.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Changes since Phil patch:
- removed single-use 'size' variable,
- removed comment on PATH_MAX (this comment will get obsolete if
trace->dir definition changes),
- asprintf return code is not used, no need to store,
---
lib/librte_eal/common/eal_common_trace_utils.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/librte_eal/common/eal_common_trace_utils.c
index 49cc8d7b1d..988d7593e1 100644
--- a/lib/librte_eal/common/eal_common_trace_utils.c
+++ b/lib/librte_eal/common/eal_common_trace_utils.c
@@ -244,22 +244,19 @@ int
eal_trace_dir_args_save(char const *val)
{
struct trace *trace = trace_obj_get();
- uint32_t size = sizeof(trace->dir);
- char *dir_path = NULL;
+ char *dir_path;
int rc;
- if (strlen(val) >= size) {
+ if (strlen(val) >= sizeof(trace->dir) - 1) {
trace_err("input string is too big");
return -ENAMETOOLONG;
}
- dir_path = (char *)calloc(1, size);
- if (dir_path == NULL) {
- trace_err("fail to allocate memory");
+ if (asprintf(&dir_path, "%s/", val) == -1) {
+ trace_err("failed to copy directory: %s", strerror(errno));
return -ENOMEM;
}
- sprintf(dir_path, "%s/", val);
rc = trace_dir_update(dir_path);
free(dir_path);
--
2.23.0
next prev parent reply other threads:[~2020-05-03 20:33 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-03 20:31 [dpdk-dev] [PATCH 0/8] Traces cleanup for rc2 David Marchand
2020-05-03 20:31 ` [dpdk-dev] [PATCH 1/8] cryptodev: fix trace points registration David Marchand
2020-05-04 7:41 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-05-03 20:31 ` [dpdk-dev] [PATCH 2/8] trace: simplify trace point registration David Marchand
2020-05-04 2:46 ` Jerin Jacob
2020-05-04 14:02 ` Thomas Monjalon
2020-05-04 14:04 ` David Marchand
2020-05-04 14:39 ` Jerin Jacob
2020-05-04 17:08 ` David Marchand
2020-05-04 17:19 ` Jerin Jacob
2020-05-04 17:40 ` David Marchand
2020-05-04 17:54 ` Jerin Jacob
2020-05-04 21:31 ` Thomas Monjalon
2020-05-05 3:43 ` Jerin Jacob
2020-05-05 7:01 ` Thomas Monjalon
2020-05-05 7:17 ` Jerin Jacob
2020-05-05 7:24 ` Thomas Monjalon
2020-05-05 7:33 ` Jerin Jacob
2020-05-05 8:23 ` David Marchand
2020-05-05 10:12 ` Jerin Jacob
2020-05-05 10:26 ` Thomas Monjalon
2020-05-05 10:46 ` Jerin Jacob
2020-05-05 11:48 ` Olivier Matz
2020-05-05 11:35 ` David Marchand
2020-05-05 12:26 ` Jerin Jacob
2020-05-05 15:25 ` Jerin Jacob
2020-05-05 16:28 ` David Marchand
2020-05-05 16:46 ` Jerin Jacob
2020-05-05 16:58 ` Thomas Monjalon
2020-05-05 17:08 ` Jerin Jacob
2020-05-05 17:09 ` Jerin Jacob
2020-05-05 17:20 ` Thomas Monjalon
2020-05-05 17:28 ` Jerin Jacob
2020-05-05 20:10 ` Thomas Monjalon
2020-05-06 6:11 ` Jerin Jacob
2020-07-04 14:31 ` Jerin Jacob
2020-07-04 15:14 ` [dpdk-dev] [PATCH v2] " David Marchand
2020-07-05 19:41 ` Thomas Monjalon
2020-05-03 20:31 ` [dpdk-dev] [PATCH 3/8] trace: simplify trace point headers David Marchand
2020-05-04 6:12 ` Jerin Jacob
2020-05-03 20:31 ` [dpdk-dev] [PATCH 4/8] trace: avoid confusion on optarg David Marchand
2020-05-04 7:55 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-05-04 14:09 ` David Marchand
2020-05-05 5:45 ` Sunil Kumar Kori
2020-05-05 5:47 ` Sunil Kumar Kori
2020-05-03 20:31 ` [dpdk-dev] [PATCH 5/8] trace: remove unneeded checks in internal API David Marchand
2020-05-04 8:16 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-05-03 20:31 ` [dpdk-dev] [PATCH 6/8] trace: remove limitation on patterns number David Marchand
2020-05-04 8:48 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-05-04 14:14 ` David Marchand
2020-05-05 5:54 ` Sunil Kumar Kori
2020-05-03 20:31 ` [dpdk-dev] [PATCH 7/8] trace: remove string duplication David Marchand
2020-05-04 9:01 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-05-03 20:31 ` David Marchand [this message]
2020-05-06 13:06 ` [dpdk-dev] [PATCH 0/8] Traces cleanup for rc2 David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200503203135.6493-9-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=lijian.zhang@arm.com \
--cc=phil.yang@arm.com \
--cc=skori@marvell.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).