From: Olivier Matz <olivier.matz@6wind.com>
To: stable@dpdk.org
Cc: Fan Zhang <roy.fan.zhang@intel.com>
Subject: [dpdk-stable] [PATCH 18.11] examples/fips_validation: fix buffer overflow
Date: Wed, 2 Dec 2020 15:39:47 +0100 [thread overview]
Message-ID: <20201202143946.26704-1-olivier.matz@6wind.com> (raw)
[ upstream commit 9275af3bd9faa0337b418736bb622704d158fbac ]
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>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
Conflicts:
examples/fips_validation/fips_validation.c
examples/fips_validation/fips_validation.h
Most of the original commit has been removed, because a part of the
issue was introduced by commit efe3a8dbb66e ("examples/fips_validation:
support TDES ECB"), and it is not present in this branch.
Only the length check on the device name remains.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
examples/fips_validation/fips_validation.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index d46f72d9b8..3ea7ffaee7 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -255,7 +255,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");
--
2.25.1
next reply other threads:[~2020-12-02 14:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 14:39 Olivier Matz [this message]
2020-12-03 16:40 ` Kevin Traynor
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=20201202143946.26704-1-olivier.matz@6wind.com \
--to=olivier.matz@6wind.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).