From owner-p4-projects@FreeBSD.ORG  Thu Sep 10 11:09:36 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF23E106568B; Thu, 10 Sep 2009 11:09:35 +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 A3BFB106566C
	for <perforce@freebsd.org>; Thu, 10 Sep 2009 11:09:35 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 93EDA8FC19
	for <perforce@freebsd.org>; Thu, 10 Sep 2009 11:09:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8AB9Zk5019917
	for <perforce@freebsd.org>; Thu, 10 Sep 2009 11:09:35 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8AB9Zrx019915
	for perforce@freebsd.org; Thu, 10 Sep 2009 11:09:35 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 10 Sep 2009 11:09:35 GMT
Message-Id: <200909101109.n8AB9Zrx019915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168397 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: Thu, 10 Sep 2009 11:09:36 -0000

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

Change 168397 by zec@zec_nxlab on 2009/09/10 11:08:39

	When expading '@' to jail names in symlinks, substitute '.'
	with '/' in case of hierarchichal jails / vimages.
	
	This change is unlikely to ever get commited to svn.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#30 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#30 (text+ko) ====

@@ -349,12 +349,24 @@
 			break;
 		}
 #ifdef IMUNES_SYMLINK_HACK
+		/*
+		 * If the symbolic link includes a special character '@',
+		 * and V_morphing_symlinks is set, substitute the first
+		 * occurence of '@' with full path to jail / vimage name.
+		 * If the full path includes subhierarchies, s/./\// when
+		 * expanding '@' to jail / vimage name.
+		 *
+		 * XXX revisit buffer length checking.
+		 */
 		CURVNET_SET(TD_TO_VNET(curthread));
 		if (V_morphing_symlinks) {
 			char *sp = strchr(cp, '@');
-			int vnamelen = strlen(td->td_ucred->cr_prison->pr_name);
 
 			if (sp) {
+				char *vname = td->td_ucred->cr_prison->pr_name;
+				int vnamelen = strlen(vname);
+				int i;
+
 				if (vnamelen >= auio.uio_resid) {
 					if (ndp->ni_pathlen > 1)
 						uma_zfree(namei_zone, cp);
@@ -367,6 +379,9 @@
 				bcopy(td->td_ucred->cr_prison->pr_name,
 				    sp, vnamelen);
 				linklen += (vnamelen - 1);
+				for (i = 0; i < vnamelen; i++)
+					if (sp[i] == '.')
+						sp[i] = '/';
 			}
 		}
 		CURVNET_RESTORE();