matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert harmful calls to strncpy() to strlcpy() 

This patch converts spots where manual buffer termination was missing to
strlcpy() since that does what is needed.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-09-01 18:52:53 +02:00 committed by Stephen Hemminger
parent 18f156bfec
commit 532b8874fe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
genl/ctrl.c
View File

@ -313,7 +313,7 @@ static int ctrl_list(int cmd, int argc, char **argv)
if (matches(*argv, "name") == 0) { if (matches(*argv, "name") == 0) {
NEXT_ARG(); NEXT_ARG();
strncpy(d, *argv, sizeof (d) - 1); strlcpy(d, *argv, sizeof(d));
addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME,
d, strlen(d) + 1); d, strlen(d) + 1);
} else if (matches(*argv, "id") == 0) { } else if (matches(*argv, "id") == 0) {

2
ip/ipvrf.c
View File

@ -74,7 +74,7 @@ static int vrf_identify(pid_t pid, char *name, size_t len)
if (end) if (end)
*end = '\0'; *end = '\0';
strncpy(name, vrf, len - 1); strlcpy(name, vrf, len);
break; break;
} }
} }

2
ip/xfrm_state.c
View File

@ -125,7 +125,7 @@ static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type,
fprintf(stderr, "warning: ALGO-NAME/ALGO-KEYMAT values will be sent to the kernel promiscuously! (verifying them isn't implemented yet)\n"); fprintf(stderr, "warning: ALGO-NAME/ALGO-KEYMAT values will be sent to the kernel promiscuously! (verifying them isn't implemented yet)\n");
#endif #endif
strncpy(alg->alg_name, name, sizeof(alg->alg_name)); strlcpy(alg->alg_name, name, sizeof(alg->alg_name));
if (slen > 2 && strncmp(key, "0x", 2) == 0) { if (slen > 2 && strncmp(key, "0x", 2) == 0) {
/* split two chars "0x" from the top */ /* split two chars "0x" from the top */