[dpdk-stable] [PATCH 18.11] examples/fips_validation: fix buffer overflow

[dpdk-stable] [PATCH 18.11] examples/fips_validation: fix buffer overflow

[Olivier Matz]

[ 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

Re: [dpdk-stable] [PATCH 18.11] examples/fips_validation: fix buffer overflow

[Kevin Traynor]

On 02/12/2020 14:39, Olivier Matz wrote:
> [ 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>

Applied, thanks.