CVS commit: src/sys/net

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Apr 24 16:59:15 UTC 2016

Modified Files:
        src/sys/net: if_pppoe.c if_spppsubr.c

Log Message:
CID 980057, 980058, use strlcpy()


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.137 -r1.138 src/sys/net/if_spppsubr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.105 src/sys/net/if_pppoe.c:1.106
--- src/sys/net/if_pppoe.c:1.105	Thu Apr 14 21:31:29 2016
+++ src/sys/net/if_pppoe.c	Sun Apr 24 12:59:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.105 2016/04/15 01:31:29 ozaki-r Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.106 2016/04/24 16:59:15 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.105 2016/04/15 01:31:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.106 2016/04/24 16:59:15 christos Exp $");
 
 #include "pppoe.h"
 
@@ -485,10 +485,9 @@ pppoe_dispatch_disc_pkt(struct mbuf *m, 
 					n = m_pulldown(m, off + sizeof(*pt),
 					    len, &noff);
 					if (n) {
-						strncpy(error,
+						strlcpy(error,
 						    mtod(n, char*) + noff,
 						    len);
-						error[len] = '\0';
 					}
 					printf("%s: connected to %s\n",
 					    devname, error);
@@ -560,9 +559,8 @@ pppoe_dispatch_disc_pkt(struct mbuf *m, 
 				n = m_pulldown(m, off + sizeof(*pt), len,
 				    &noff);
 				if (n && error) {
-					strncpy(error, 
+					strlcpy(error, 
 					    mtod(n, char *) + noff, len);
-					error[len] = '\0';
 				}
 			}
 			if (error) {
@@ -949,7 +947,8 @@ pppoe_ioctl(struct ifnet *ifp, unsigned 
 		struct pppoediscparms *parms = (struct pppoediscparms*)data;
 		memset(parms, 0, sizeof *parms);
 		if (sc->sc_eth_if)
-			strncpy(parms->ifname, sc->sc_eth_if->if_xname, IFNAMSIZ);
+			strlcpy(parms->ifname, sc->sc_eth_if->if_xname,
+			    sizeof(parms->ifname));
 		return 0;
 	}
 	break;

Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.137 src/sys/net/if_spppsubr.c:1.138
--- src/sys/net/if_spppsubr.c:1.137	Sat Apr 23 08:15:38 2016
+++ src/sys/net/if_spppsubr.c	Sun Apr 24 12:59:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.137 2016/04/23 12:15:38 martin Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.138 2016/04/24 16:59:15 christos Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.137 2016/04/23 12:15:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.138 2016/04/24 16:59:15 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -5070,7 +5070,7 @@ sppp_params(struct sppp *sp, u_long cmd,
 
 		cfg->myauthflags = sp->myauth.flags;
 		cfg->hisauthflags = sp->hisauth.flags;
-		strncpy(cfg->ifname, sp->pp_if.if_xname, IFNAMSIZ);
+		strlcpy(cfg->ifname, sp->pp_if.if_xname, sizeof(cfg->ifname));
 		cfg->hisauth = 0;
 		if (sp->hisauth.proto)
 		    cfg->hisauth = (sp->hisauth.proto == PPP_PAP) ? SPPP_AUTHPROTO_PAP : SPPP_AUTHPROTO_CHAP;