Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Oct 2018 07:35:17 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r339121 - head/sys/net
Message-ID:  <201810030735.w937ZHf5009583@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Wed Oct  3 07:35:16 2018
New Revision: 339121
URL: https://svnweb.freebsd.org/changeset/base/339121

Log:
  Use strlcpy() instead of strncpy().
  
  Approved by:            re (kib@)
  CID:			1395980, 1395981
  X-MFC with:		r339012
  MFC after:              1 week

Modified:
  head/sys/net/if_tap.c
  head/sys/net/if_tun.c

Modified: head/sys/net/if_tap.c
==============================================================================
--- head/sys/net/if_tap.c	Wed Oct  3 03:14:40 2018	(r339120)
+++ head/sys/net/if_tap.c	Wed Oct  3 07:35:16 2018	(r339121)
@@ -741,7 +741,7 @@ tapioctl(struct cdev *dev, u_long cmd, caddr_t data, i
 				return (EPROTOTYPE);
 			mtx_lock(&tp->tap_mtx);
 			if (ifp->if_mtu != tapp->mtu) {
-				strncpy(ifr.ifr_name, if_name(ifp), IFNAMSIZ);
+				strlcpy(ifr.ifr_name, if_name(ifp), IFNAMSIZ);
 				ifr.ifr_mtu = tapp->mtu;
 				CURVNET_SET(ifp->if_vnet);
 				error = ifhwioctl(SIOCSIFMTU, ifp,

Modified: head/sys/net/if_tun.c
==============================================================================
--- head/sys/net/if_tun.c	Wed Oct  3 03:14:40 2018	(r339120)
+++ head/sys/net/if_tun.c	Wed Oct  3 07:35:16 2018	(r339121)
@@ -674,7 +674,7 @@ tunioctl(struct cdev *dev, u_long cmd, caddr_t data, i
 			return (EPROTOTYPE);
 		mtx_lock(&tp->tun_mtx);
 		if (TUN2IFP(tp)->if_mtu != tunp->mtu) {
-			strncpy(ifr.ifr_name, if_name(TUN2IFP(tp)), IFNAMSIZ);
+			strlcpy(ifr.ifr_name, if_name(TUN2IFP(tp)), IFNAMSIZ);
 			ifr.ifr_mtu = tunp->mtu;
 			CURVNET_SET(TUN2IFP(tp)->if_vnet);
 			error = ifhwioctl(SIOCSIFMTU, TUN2IFP(tp),



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810030735.w937ZHf5009583>