From: bluhm <bluhm@openbsd.org>
Date: Wed, 10 Feb 2021 14:45:27 +0000 (+0000)
Subject: Use the same check in kernel and ifconfig for group names.  ifconfig
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dd7c33c7437eed727496fd0c21ef0af53292ff05;p=openbsd

Use the same check in kernel and ifconfig for group names.  ifconfig
delete group does not need name sanitation.  The kernel will just
report that it does not exist.
OK deraadt@ gnezdo@ anton@ mvs@ claudio@
---

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 6b02c60f94b..9937e448416 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.432 2021/01/16 17:44:29 claudio Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.433 2021/02/10 14:45:27 bluhm Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -1634,16 +1634,20 @@ void
 setifgroup(const char *group_name, int dummy)
 {
 	struct ifgroupreq ifgr;
+	size_t namelen;
 
 	memset(&ifgr, 0, sizeof(ifgr));
 	strlcpy(ifgr.ifgr_name, ifname, IFNAMSIZ);
 
-	if (group_name[0] &&
-	    isdigit((unsigned char)group_name[strlen(group_name) - 1]))
+	namelen = strlen(group_name);
+	if (namelen == 0)
+		errx(1, "setifgroup: group name empty");
+	if (namelen >= IFNAMSIZ)
+		errx(1, "setifgroup: group name too long");
+	if (isdigit((unsigned char)group_name[namelen - 1]))
 		errx(1, "setifgroup: group names may not end in a digit");
 
-	if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
-		errx(1, "setifgroup: group name too long");
+	strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ);
 	if (ioctl(sock, SIOCAIFGROUP, (caddr_t)&ifgr) == -1) {
 		if (errno != EEXIST)
 			err(1," SIOCAIFGROUP");
@@ -1659,10 +1663,6 @@ unsetifgroup(const char *group_name, int dummy)
 	memset(&ifgr, 0, sizeof(ifgr));
 	strlcpy(ifgr.ifgr_name, ifname, IFNAMSIZ);
 
-	if (group_name[0] &&
-	    isdigit((unsigned char)group_name[strlen(group_name) - 1]))
-		errx(1, "unsetifgroup: group names may not end in a digit");
-
 	if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
 		errx(1, "unsetifgroup: group name too long");
 	if (ioctl(sock, SIOCDIFGROUP, (caddr_t)&ifgr) == -1)