[dpdk-dev] [PATCH] eal: check vsnprintf failure and return -EINVAL

[dpdk-dev] [PATCH] eal: check vsnprintf failure and return -EINVAL

[Tyler Retzlaff]

Check for failure, while here just increment len once after checking for
failure instead of duplicating len + 1 math in two different argument
lists.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/librte_eal/common/eal_common_devargs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index fcf3d9a3c..71753a4a0 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -233,7 +233,7 @@ int
 rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
 {
 	va_list ap;
-	size_t len;
+	int len;
 	char *dev;
 	int ret;
 
@@ -243,15 +243,18 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
 	va_start(ap, format);
 	len = vsnprintf(NULL, 0, format, ap);
 	va_end(ap);
+	if (len < 0)
+		return -EINVAL;
 
-	dev = calloc(1, len + 1);
+	len += 1;
+	dev = calloc(1, (size_t)len);
 	if (dev == NULL) {
 		RTE_LOG(ERR, EAL, "not enough memory to parse device\n");
 		return -ENOMEM;
 	}
 
 	va_start(ap, format);
-	vsnprintf(dev, len + 1, format, ap);
+	vsnprintf(dev, (size_t)len, format, ap);
 	va_end(ap);
 
 	ret = rte_devargs_parse(da, dev);
-- 
2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH] eal: check vsnprintf failure and return -EINVAL

[Thomas Monjalon]

16/03/2021 00:55, Tyler Retzlaff:
> Check for failure, while here just increment len once after checking for
> failure instead of duplicating len + 1 math in two different argument
> lists.
> 
> Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>

Applied, thanks