From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 26 Feb 2019 19:48:12 +0000 (+0000)
Subject: isisd: strncpy -> strlcpy
X-Git-Tag: 7.1_pulled~200^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e28544ed990faacbeca44f11ab379a25c8c1dfd6;p=mirror%2Ffrr.git

isisd: strncpy -> strlcpy

strncpy is a byte copy function not a string copy function

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 36d4a0d7c0..8377638b92 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1305,8 +1305,8 @@ ferr_r isis_circuit_passwd_unset(struct isis_circuit *circuit)
 	return ferr_ok();
 }
 
-static int isis_circuit_passwd_set(struct isis_circuit *circuit,
-				   uint8_t passwd_type, const char *passwd)
+ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit,
+			       uint8_t passwd_type, const char *passwd)
 {
 	int len;
 
@@ -1319,7 +1319,8 @@ static int isis_circuit_passwd_set(struct isis_circuit *circuit,
 			"circuit password too long (max 254 chars)");
 
 	circuit->passwd.len = len;
-	strncpy((char *)circuit->passwd.passwd, passwd, 255);
+	strlcpy((char *)circuit->passwd.passwd, passwd,
+		sizeof(circuit->passwd.passwd));
 	circuit->passwd.type = passwd_type;
 	return ferr_ok();
 }
diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index 73ead8f7da..e0ea4f78b4 100644
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -190,6 +190,8 @@ ferr_r isis_circuit_metric_set(struct isis_circuit *circuit, int level,
 			       int metric);
 
 ferr_r isis_circuit_passwd_unset(struct isis_circuit *circuit);
+ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit,
+			       uint8_t passwd_type, const char *passwd);
 ferr_r isis_circuit_passwd_cleartext_set(struct isis_circuit *circuit,
 					 const char *passwd);
 ferr_r isis_circuit_passwd_hmac_md5_set(struct isis_circuit *circuit,
diff --git a/isisd/isis_northbound.c b/isisd/isis_northbound.c
index 3364a9f0be..2d1d6f5927 100644
--- a/isisd/isis_northbound.c
+++ b/isisd/isis_northbound.c
@@ -2092,8 +2092,8 @@ lib_interface_isis_password_password_modify(enum nb_event event,
 
 	password = yang_dnode_get_string(dnode, NULL);
 	circuit = yang_dnode_get_entry(dnode, true);
-	circuit->passwd.len = strlen(password);
-	strncpy((char *)circuit->passwd.passwd, password, 255);
+
+	isis_circuit_passwd_set(circuit, circuit->passwd.type, password);
 
 	return NB_OK;
 }
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 13cd510dd1..ad02220438 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1363,7 +1363,7 @@ struct isis_lsp *lsp_for_arg(const char *argv, dict_t *lspdb)
 	 * xxxx.xxxx.xxxx
 	 */
 	if (argv)
-		strncpy(sysid, argv, 254);
+		strlcpy(sysid, argv, sizeof(sysid));
 	if (argv && strlen(argv) > 3) {
 		pos = argv + strlen(argv) - 3;
 		if (strncmp(pos, "-", 1) == 0) {
@@ -1639,7 +1639,8 @@ static int isis_area_passwd_set(struct isis_area *area, int level,
 			return -1;
 
 		modified.len = len;
-		strncpy((char *)modified.passwd, passwd, 255);
+		strlcpy((char *)modified.passwd, passwd,
+			sizeof(modified.passwd));
 		modified.type = passwd_type;
 		modified.snp_auth = snp_auth;
 	}