[v2] app/test: fix sprintf with strlcat

Message ID 1552475243-16215-1-git-send-email-pallantlax.poornima@intel.com
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • [v2] app/test: fix sprintf with strlcat
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Pallantla Poornima March 13, 2019, 11:07 a.m.
sprintf function is not secure as it doesn't check the length of string.
More secure function strlcat is used.

Fixes: 727909c592 ("app/test: introduce dynamic commands list")
Cc: stable@dpdk.org

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
---
v2: Used strlcat to avoid buffer overflow.
---
 app/test/commands.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Aaron Conole March 13, 2019, 1:51 p.m. | #1
Pallantla Poornima <pallantlax.poornima@intel.com> writes:

> sprintf function is not secure as it doesn't check the length of string.
> More secure function strlcat is used.
>
> Fixes: 727909c592 ("app/test: introduce dynamic commands list")
> Cc: stable@dpdk.org
>
> Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
> ---
> v2: Used strlcat to avoid buffer overflow.
> ---

LGTM.

Reviewed-by: Aaron Conole <aconole@redhat.com>
Thomas Monjalon April 2, 2019, 12:37 a.m. | #2
13/03/2019 14:51, Aaron Conole:
> Pallantla Poornima <pallantlax.poornima@intel.com> writes:
> 
> > sprintf function is not secure as it doesn't check the length of string.
> > More secure function strlcat is used.
> >
> > Fixes: 727909c592 ("app/test: introduce dynamic commands list")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
> > ---
> > v2: Used strlcat to avoid buffer overflow.
> > ---
> 
> LGTM.
> 
> Reviewed-by: Aaron Conole <aconole@redhat.com>

Applied, thanks

Patch

diff --git a/app/test/commands.c b/app/test/commands.c
index 94fbc310e..8d5a03a95 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -44,6 +44,7 @@ 
 #include <cmdline_parse_num.h>
 #include <cmdline_parse_string.h>
 #include <cmdline.h>
+#include <rte_string_fns.h>
 
 #include "test.h"
 
@@ -365,23 +366,22 @@  cmdline_parse_ctx_t main_ctx[] = {
 int commands_init(void)
 {
 	struct test_command *t;
-	char *commands, *ptr;
+	char *commands;
 	int commands_len = 0;
 
 	TAILQ_FOREACH(t, &commands_list, next) {
 		commands_len += strlen(t->command) + 1;
 	}
 
-	commands = malloc(commands_len + 1);
+	commands = (char *)calloc(commands_len, sizeof(char));
 	if (!commands)
 		return -1;
 
-	ptr = commands;
 	TAILQ_FOREACH(t, &commands_list, next) {
-		ptr += sprintf(ptr, "%s#", t->command);
+		strlcat(commands, t->command, commands_len);
+		if (TAILQ_NEXT(t, next) != NULL)
+			strlcat(commands, "#", commands_len);
 	}
-	ptr--;
-	ptr[0] = '\0';
 
 	cmd_autotest_autotest.string_data.str = commands;
 	return 0;