Some of the module set arg routines were still using

sprintf instead of snprintf when preparing the output buffer. Signed-off-by: Eric Multanen <[email protected]>
jrfastab · Aug 14, 2012 · 2a648c9 · 2a648c9
1 parent bd20de5
commit 2a648c9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/lldp_8021qaz_cmds.c b/lldp_8021qaz_cmds.c
@@ -594,7 +594,7 @@ static int get_arg_tcbw(struct cmd *cmd, char *args,
 		strncat(buf, cat, sizeof(buf) - strlen(buf) - 1);
 	}
 
-	sprintf(obuf, "%02x%s%04x%s", (unsigned int) strlen(args),
+	snprintf(obuf, obuf_len, "%02x%s%04x%s", (unsigned int) strlen(args),
 		args, (unsigned int) strlen(buf), buf);
 
 	return cmd_success;
@@ -743,7 +743,7 @@ static int get_arg_tsa(struct cmd *cmd, char *args, UNUSED char *arg_value,
 		}
 	}
 
-	sprintf(obuf, "%02x%s%04x%s",
+	snprintf(obuf, obuf_len, "%02x%s%04x%s",
 		(unsigned int) strlen(args), args,
 		(unsigned int) strlen(buf), buf);
 
@@ -922,7 +922,7 @@ static int get_arg_enabled(struct cmd *cmd, char *args, UNUSED char *arg_value,
 		}
 	}
 
-	sprintf(obuf, "%02x%s%04x%s",
+	snprintf(obuf, obuf_len, "%02x%s%04x%s",
 		(unsigned int) strlen(args), args,
 		(unsigned int) strlen(buf), buf);
 

diff --git a/lldp_8023_cmds.c b/lldp_8023_cmds.c
@@ -95,7 +95,7 @@ get_arg_tlvtxenable(struct cmd *cmd, char *arg, UNUSED char *argvalue,
 }
 
 static int _set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-				char *obuf, bool test)
+				char *obuf, int obuf_len, bool test)
 {
 	int value;
 	char arg_path[256];
@@ -132,22 +132,22 @@ static int _set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
 		    CONFIG_TYPE_BOOL))
 		return cmd_failed;
 
-	sprintf(obuf, "enableTx = %s\n", value ? "yes" : "no");
+	snprintf(obuf, obuf_len, "enableTx = %s\n", value ? "yes" : "no");
 	somethingChangedLocal(cmd->ifname, cmd->type);
 
 	return cmd_success;
 }
 
 static int set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-			       char *obuf, UNUSED int obuf_len)
+			       char *obuf, int obuf_len)
 {
-	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, false);
+	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, obuf_len, false);
 }
 
 static int test_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-			       char *obuf, UNUSED int obuf_len)
+			       char *obuf, int obuf_len)
 {
-	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, true);
+	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, obuf_len, true);
 }
 
 struct arg_handlers *ieee8023_get_arg_handlers()

diff --git a/lldp_basman_cmds.c b/lldp_basman_cmds.c
@@ -109,7 +109,7 @@ get_arg_tlvtxenable(struct cmd *cmd, char *arg, UNUSED char *argvalue,
 }
 
 static int _set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-			       char *obuf, bool test)
+			       char *obuf, int obuf_len, bool test)
 {
 	int value;
 	char arg_path[256];
@@ -147,23 +147,23 @@ static int _set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
 		    CONFIG_TYPE_BOOL))
 		return cmd_failed;
 
-	sprintf(obuf, "enableTx = %s\n", value ? "yes" : "no");
+	snprintf(obuf, obuf_len, "enableTx = %s\n", value ? "yes" : "no");
 
 	somethingChangedLocal(cmd->ifname, cmd->type);
 
 	return cmd_success;
 }
 
 static int set_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-			       char *obuf, UNUSED int obuf_len)
+			       char *obuf, int obuf_len)
 {
-	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, false);
+	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, obuf_len, false);
 }
 
 static int test_arg_tlvtxenable(struct cmd *cmd, char *arg, char *argvalue,
-			       char *obuf, UNUSED int obuf_len)
+			       char *obuf, int obuf_len)
 {
-	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, true);
+	return _set_arg_tlvtxenable(cmd, arg, argvalue, obuf, obuf_len, true);
 }
 
 struct arg_handlers *basman_get_arg_handlers()
@@ -223,7 +223,7 @@ int get_arg_ipv6(struct cmd *cmd, char *arg, UNUSED char *argvalue,
 }
 
 int _set_arg_ipv4(struct cmd *cmd, char *arg, char *argvalue,
-		  char *obuf, bool test)
+		  char *obuf, int obuf_len, bool test)
 {
 	struct in_addr ipv4addr;
 	char arg_path[256];
@@ -246,27 +246,27 @@ int _set_arg_ipv4(struct cmd *cmd, char *arg, char *argvalue,
 		    CONFIG_TYPE_STRING))
 		return cmd_failed;
 
-	sprintf(obuf, "ipv4 = %s\n", argvalue);
+	snprintf(obuf, obuf_len, "ipv4 = %s\n", argvalue);
 
 	somethingChangedLocal(cmd->ifname, cmd->type);
 
 	return cmd_success;
 }
 
 int set_arg_ipv4(struct cmd *cmd, char *arg, char *argvalue,
-		 char *obuf, UNUSED int obuf_len)
+		 char *obuf, int obuf_len)
 {
-	return _set_arg_ipv4(cmd, arg, argvalue, obuf, false);
+	return _set_arg_ipv4(cmd, arg, argvalue, obuf, obuf_len, false);
 }
 
 int test_arg_ipv4(struct cmd *cmd, char *arg, char *argvalue,
-		  char *obuf, UNUSED int obuf_len)
+		  char *obuf, int obuf_len)
 {
-	return _set_arg_ipv4(cmd, arg, argvalue, obuf, true);
+	return _set_arg_ipv4(cmd, arg, argvalue, obuf, obuf_len, true);
 }
 
 int _set_arg_ipv6(struct cmd *cmd, char *arg, char *argvalue,
-		  char *obuf, bool test)
+		  char *obuf, int obuf_len, bool test)
 {
 	struct in6_addr ipv6addr;
 	char arg_path[256];
@@ -289,20 +289,20 @@ int _set_arg_ipv6(struct cmd *cmd, char *arg, char *argvalue,
 		    CONFIG_TYPE_STRING))
 		return cmd_failed;
 
-	sprintf(obuf, "ipv6 = %s\n", argvalue);
+	snprintf(obuf, obuf_len, "ipv6 = %s\n", argvalue);
 	somethingChangedLocal(cmd->ifname, cmd->type);
 
 	return cmd_success;
 }
 
 int set_arg_ipv6(struct cmd *cmd, char *arg, char *argvalue,
-		 char *obuf, UNUSED int obuf_len)
+		 char *obuf, int obuf_len)
 {
-	return _set_arg_ipv6(cmd, arg, argvalue, obuf, false);
+	return _set_arg_ipv6(cmd, arg, argvalue, obuf, obuf_len, false);
 }
 
 int test_arg_ipv6(struct cmd *cmd, char *arg, char *argvalue,
-		  char *obuf, UNUSED int obuf_len)
+		  char *obuf, int obuf_len)
 {
-	return _set_arg_ipv6(cmd, arg, argvalue, obuf, false);
+	return _set_arg_ipv6(cmd, arg, argvalue, obuf, obuf_len, false);
 }
diff --git a/lldp_mand_cmds.c b/lldp_mand_cmds.c
@@ -459,7 +459,7 @@ int _set_arg_adminstatus(struct cmd *cmd, char *arg, char *argvalue,
 
 	set_lldp_agent_admin(cmd->ifname, cmd->type, value);
 
-	sprintf(obuf, "adminStatus = %s\n", argvalue);
+	snprintf(obuf, obuf_len, "adminStatus = %s\n", argvalue);
 
 	return cmd_success;
 }