diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-02-25 17:37:34 +0000 | 
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-02-25 17:52:37 +0000 | 
| commit | 138a49659671bc247a98c51869c625e8fcd6d46e (patch) | |
| tree | 31a62cbc67996a7c7dd21c170c0e856be6954616 /zebra/ioctl.c | |
| parent | 5a80b8c7c254b9955e357555ebd929ab9bc123ef (diff) | |
zebra: remove all instances of strncpy
We have strlcpy.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra/ioctl.c')
| -rw-r--r-- | zebra/ioctl.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/ioctl.c b/zebra/ioctl.c index ebe1edcaef..9499c731ef 100644 --- a/zebra/ioctl.c +++ b/zebra/ioctl.c @@ -213,7 +213,7 @@ int if_set_prefix(struct interface *ifp, struct connected *ifc)  	rib_lookup_and_pushup(p, ifp->vrf_id);  	memset(&addreq, 0, sizeof addreq); -	strncpy((char *)&addreq.ifra_name, ifp->name, sizeof addreq.ifra_name); +	strlcpy(addreq.ifra_name, ifp->name, sizeof(addreq.ifra_name));  	memset(&addr, 0, sizeof(struct sockaddr_in));  	addr.sin_addr = p->prefix; @@ -267,7 +267,7 @@ int if_unset_prefix(struct interface *ifp, struct connected *ifc)  	p = (struct prefix_ipv4 *)ifc->address;  	memset(&addreq, 0, sizeof addreq); -	strncpy((char *)&addreq.ifra_name, ifp->name, sizeof addreq.ifra_name); +	strlcpy(addreq.ifra_name, ifp->name, sizeof(addreq.ifra_name));  	memset(&addr, 0, sizeof(struct sockaddr_in));  	addr.sin_addr = p->prefix; @@ -412,7 +412,7 @@ void if_get_flags(struct interface *ifp)  	if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) {  		(void)memset(&ifmr, 0, sizeof(ifmr)); -		strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ); +		strlcpy(ifmr.ifm_name, ifp->name, sizeof(ifmr.ifm_name));  		/* Seems not all interfaces implement this ioctl */  		if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) == -1 && @@ -514,7 +514,7 @@ int if_prefix_add_ipv6(struct interface *ifp, struct connected *ifc)  	p = (struct prefix_ipv6 *)ifc->address;  	memset(&addreq, 0, sizeof addreq); -	strncpy((char *)&addreq.ifra_name, ifp->name, sizeof addreq.ifra_name); +	strlcpy(addreq.ifra_name, ifp->name, sizeof(addreq.ifra_name));  	memset(&addr, 0, sizeof(struct sockaddr_in6));  	addr.sin6_addr = p->prefix; @@ -557,7 +557,7 @@ int if_prefix_delete_ipv6(struct interface *ifp, struct connected *ifc)  	p = (struct prefix_ipv6 *)ifc->address;  	memset(&addreq, 0, sizeof addreq); -	strncpy((char *)&addreq.ifra_name, ifp->name, sizeof addreq.ifra_name); +	strlcpy(addreq.ifra_name, ifp->name, sizeof(addreq.ifra_name));  	memset(&addr, 0, sizeof(struct sockaddr_in6));  	addr.sin6_addr = p->prefix;  | 
