From owner-p4-projects@FreeBSD.ORG  Mon Sep 10 00:28:07 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D414616A468; Mon, 10 Sep 2007 00:28:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A54B416A420
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:28:06 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DC1B13C459
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:28:06 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A0S6wY002522
	for <perforce@FreeBSD.org>; Mon, 10 Sep 2007 00:28:06 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A0S6ZJ002519
	for perforce@freebsd.org; Mon, 10 Sep 2007 00:28:06 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 10 Sep 2007 00:28:06 GMT
Message-Id: <200709100028.l8A0S6ZJ002519@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126248 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2007 00:28:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=126248

Change 126248 by zec@zec_tpx32 on 2007/09/10 00:28:01

	When a vlan ifnet is assigned to a remote vnet, do not
	allow vlandev/vlantag to be either read or updated.  In
	effect this makes a vlan ifnet assigned to a remote vnet
	(at least visually) indistinguishable from plain ethernet
	ifnets.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_vlan.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/if_vlan.c#5 (text+ko) ====

@@ -1379,6 +1379,12 @@
 		error = copyin(ifr->ifr_data, &vlr, sizeof(vlr));
 		if (error)
 			break;
+#ifdef VIMAGE
+		if (ifp->if_home_vnet != ifp->if_vnet) {
+			error = EPERM;
+			break;
+		}
+#endif
 		if (vlr.vlr_parent[0] == '\0') {
 			vlan_unconfig(ifp);
 			break;
@@ -1406,6 +1412,12 @@
 
 	case SIOCGETVLAN:
 		bzero(&vlr, sizeof(vlr));
+#ifdef VIMAGE
+		if (ifp->if_home_vnet != ifp->if_vnet) {
+			error = EPERM;
+			break;
+		}
+#endif
 		VLAN_LOCK();
 		if (TRUNK(ifv) != NULL) {
 			strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname,