From 9556150792daf8f2fbea934bcb77b4b74a21b2e1 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Mon, 29 Apr 2019 20:09:12 +0200 Subject: [PATCH] Convert harmful calls to strncpy() to strlcpy() Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1465646 Upstream Status: iproute2.git commit 532b8874fe545 commit 532b8874fe545acaa8d45c4dd3b54b8f3bb41d9f Author: Phil Sutter Date: Fri Sep 1 18:52:53 2017 +0200 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 --- genl/ctrl.c | 2 +- ip/ipvrf.c | 2 +- ip/xfrm_state.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/genl/ctrl.c b/genl/ctrl.c index 21e857cfcfc25..a6d31b04e5679 100644 --- a/genl/ctrl.c +++ b/genl/ctrl.c @@ -317,7 +317,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 f58c8df728265..406cddbcd44ca 100644 --- a/ip/ipvrf.c +++ b/ip/ipvrf.c @@ -71,7 +71,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 04ed3492ad3b5..2222737cdd98d 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -123,7 +123,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 */ -- 2.21.0