From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: Marko Kovacevic <marko.kovacevic@intel.com>,
Akhil Goyal <akhil.goyal@nxp.com>,
Fan Zhang <roy.fan.zhang@intel.com>,
Arek Kusztal <arkadiuszx.kusztal@intel.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH 1/3] examples/fips_validation: fix buffer overflow
Date: Tue, 6 Oct 2020 09:41:41 +0200 [thread overview]
Message-ID: <20201006074143.31691-2-olivier.matz@6wind.com> (raw)
In-Reply-To: <20201006074143.31691-1-olivier.matz@6wind.com>
If the file name is larger than MAX_STRING_SIZE (64), strcpy()
will overwrite the content of memory.
Replace strcpy() by rte_strscpy(), check its return value, and
increase file_name size to 256.
Fixes: 3d0fad56b74a ("examples/fips_validation: add crypto FIPS application")
Cc: stable@dpdk.org
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
examples/fips_validation/fips_validation.c | 12 ++++++++++--
examples/fips_validation/fips_validation.h | 3 ++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 9bdf257b8b..13f763c9aa 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -281,7 +281,11 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,
fips_test_clear();
- strcpy(info.file_name, req_file_path);
+ if (rte_strscpy(info.file_name, req_file_path,
+ sizeof(info.file_name)) < 0) {
+ RTE_LOG(ERR, USER1, "Path %s too long\n", req_file_path);
+ return -EINVAL;
+ }
info.algo = FIPS_TEST_ALGO_MAX;
if (parse_file_type(req_file_path) < 0) {
RTE_LOG(ERR, USER1, "File %s type not supported\n",
@@ -307,7 +311,11 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,
return -ENOMEM;
}
- strlcpy(info.device_name, device_name, sizeof(info.device_name));
+ if (rte_strscpy(info.device_name, device_name,
+ sizeof(info.device_name)) < 0) {
+ RTE_LOG(ERR, USER1, "Device name %s too long\n", device_name);
+ return -EINVAL;
+ }
if (fips_test_parse_header() < 0) {
RTE_LOG(ERR, USER1, "Failed parsing header\n");
diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h
index 75fa555fa6..deba83eada 100644
--- a/examples/fips_validation/fips_validation.h
+++ b/examples/fips_validation/fips_validation.h
@@ -14,6 +14,7 @@
#define MAX_NB_TESTS 10240
#define MAX_BUF_SIZE 2048
#define MAX_STRING_SIZE 64
+#define MAX_FILE_NAME_SIZE 256
#define MAX_DIGEST_SIZE 64
#define POSITIVE_TEST 0
@@ -164,7 +165,7 @@ struct fips_test_interim_info {
uint32_t vec_start_off;
uint32_t nb_vec_lines;
char device_name[MAX_STRING_SIZE];
- char file_name[MAX_STRING_SIZE];
+ char file_name[MAX_FILE_NAME_SIZE];
union {
struct aesavs_interim_data aes_data;
--
2.25.1
next prev parent reply other threads:[~2020-10-06 7:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 7:41 [dpdk-dev] [PATCH 0/3] examples/fips_validation: misc fixes Olivier Matz
2020-10-06 7:41 ` Olivier Matz [this message]
2020-10-06 8:48 ` [dpdk-dev] [PATCH 1/3] examples/fips_validation: fix buffer overflow Zhang, Roy Fan
2020-10-06 7:41 ` [dpdk-dev] [PATCH 2/3] examples/fips_validation: ignore \r in input files Olivier Matz
2020-10-06 8:47 ` Zhang, Roy Fan
2020-10-06 10:09 ` Olivier Matz
2020-10-08 8:50 ` Zhang, Roy Fan
2020-10-08 9:21 ` Olivier Matz
2020-10-08 10:24 ` Zhang, Roy Fan
2020-10-08 11:32 ` Olivier Matz
2020-10-08 12:41 ` Zhang, Roy Fan
2020-10-08 14:19 ` Olivier Matz
2020-10-09 9:33 ` Zhang, Roy Fan
2020-10-09 18:19 ` Akhil Goyal
2020-10-06 7:41 ` [dpdk-dev] [PATCH 3/3] examples/fips_validation: support self-test only Olivier Matz
2020-10-06 8:55 ` Zhang, Roy Fan
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=20201006074143.31691-2-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=akhil.goyal@nxp.com \
--cc=arkadiuszx.kusztal@intel.com \
--cc=dev@dpdk.org \
--cc=marko.kovacevic@intel.com \
--cc=roy.fan.zhang@intel.com \
--cc=stable@dpdk.org \
/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).