[dpdk-dev] [PATCH] examples/ipsec-secgw: fix ip address parsing
Kirill Rybalchenko
kirill.rybalchenko at intel.com
Mon May 14 12:00:51 CEST 2018
In strlcpy function parameters there was no allowance for
null terminator, so ip address was copied without last character.
Fixes: ae943ebe1ed3 ("examples/ipsec-secgw: replace strncpy with strlcpy")
Signed-off-by: Kirill Rybalchenko <kirill.rybalchenko at intel.com>
---
examples/ipsec-secgw/parser.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index e2e3429..91282ca 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -213,8 +213,9 @@ parse_ipv4_addr(const char *token, struct in_addr *ipv4, uint32_t *mask)
pch = strchr(token, '/');
if (pch != NULL) {
- strlcpy(ip_str, token, RTE_MIN((unsigned int long)(pch - token),
- sizeof(ip_str)));
+ strlcpy(ip_str, token,
+ RTE_MIN((unsigned int long)(pch - token + 1),
+ sizeof(ip_str)));
pch += 1;
if (is_str_num(pch) != 0)
return -EINVAL;
@@ -225,7 +226,6 @@ parse_ipv4_addr(const char *token, struct in_addr *ipv4, uint32_t *mask)
if (mask)
*mask = 0;
}
-
if (strlen(ip_str) >= INET_ADDRSTRLEN)
return -EINVAL;
@@ -243,7 +243,8 @@ parse_ipv6_addr(const char *token, struct in6_addr *ipv6, uint32_t *mask)
pch = strchr(token, '/');
if (pch != NULL) {
- strlcpy(ip_str, token, RTE_MIN((unsigned int long)(pch - token),
+ strlcpy(ip_str, token,
+ RTE_MIN((unsigned int long)(pch - token + 1),
sizeof(ip_str)));
pch += 1;
if (is_str_num(pch) != 0)
--
2.5.5
More information about the dev
mailing list