From owner-p4-projects  Mon Apr  8 17:21:18 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38AEB37B417; Mon,  8 Apr 2002 17:21:12 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 780B437B405
	for <perforce@freebsd.org>; Mon,  8 Apr 2002 17:21:11 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g390LBI19321
	for perforce@freebsd.org; Mon, 8 Apr 2002 17:21:11 -0700 (PDT)
	(envelope-from amigus@tislabs.com)
Date: Mon, 8 Apr 2002 17:21:11 -0700 (PDT)
Message-Id: <200204090021.g390LBI19321@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f
From: Adam Migus <amigus@FreeBSD.org>
Subject: PERFORCE change 9413 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9413

Change 9413 by amigus@amigus_ganyopa on 2002/04/08 17:20:55

	Oops.  Forgot to test and properly handle when user declares an
	interface name with strlen() > IFNAMSIZ.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#27 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#27 (text+ko) ====

@@ -465,20 +465,22 @@
 		else
 			len = strlen(p0);
 
-		if (len > IFNAMSIZ) {
+		if (len <= IFNAMSIZ) {
+			strncpy(tifr_name, p0, len);
+			if (!strncmp(tifr_name, ifr_name, len) &&
+			    len == strlen(ifr_name)) {
+				trusted_interface = 1;
+				break;
+			}
+		} else if (len == 0) {
+			break;
+		} else {
 			if (p1)
 				*p1 = '\0';
-			printf("%s: name exceeds maximum length\n", p0);
+			printf("%s: interface name exceeds IFNAMSIZ (%d)\n",
+			    p0, IFNAMSIZ);
 			if (p1)
 				*p1 = ',';
-		} else if (len == 0)
-			break;
-
-		strncpy(tifr_name, p0, len);
-		if (!strncmp(tifr_name, ifr_name, len) &&
-		    len == strlen(ifr_name)) {
-			trusted_interface = 1;
-			break;
 		}
 
 		if (p1 == NULL)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message