diff --git a/genl/ctrl.c b/genl/ctrl.c index 6abd5258..448988eb 100644 --- a/genl/ctrl.c +++ b/genl/ctrl.c @@ -313,7 +313,7 @@ static int ctrl_list(int cmd, int argc, char **argv) if (matches(*argv, "name") == 0) { NEXT_ARG(); - strncpy(d, *argv, sizeof (d) - 1); + strlcpy(d, *argv, sizeof(d)); addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, d, strlen(d) + 1); } else if (matches(*argv, "id") == 0) { diff --git a/ip/ipvrf.c b/ip/ipvrf.c index b74c501e..f9277e1e 100644 --- a/ip/ipvrf.c +++ b/ip/ipvrf.c @@ -74,7 +74,7 @@ static int vrf_identify(pid_t pid, char *name, size_t len) if (end) *end = '\0'; - strncpy(name, vrf, len - 1); + strlcpy(name, vrf, len); break; } } diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index e11c93bf..4483fb8f 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -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"); #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) { /* split two chars "0x" from the top */