From owner-svn-src-head@FreeBSD.ORG  Wed Dec 15 16:49:47 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A32C11065679;
	Wed, 15 Dec 2010 16:49:47 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 921908FC14;
	Wed, 15 Dec 2010 16:49:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBFGnlDw066050;
	Wed, 15 Dec 2010 16:49:47 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFGnldp066048;
	Wed, 15 Dec 2010 16:49:47 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201012151649.oBFGnldp066048@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Wed, 15 Dec 2010 16:49:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216462 - head/sys/fs/devfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2010 16:49:47 -0000

Author: jh
Date: Wed Dec 15 16:49:47 2010
New Revision: 216462
URL: http://svn.freebsd.org/changeset/base/216462

Log:
  Don't allow user created symbolic links to cover another entries marked
  with DE_USER. If a devfs rule hid such entry, it was possible to create
  infinite number of symbolic links with the same name.
  
  Reviewed by:	kib

Modified:
  head/sys/fs/devfs/devfs_vnops.c

Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c	Wed Dec 15 16:42:44 2010	(r216461)
+++ head/sys/fs/devfs/devfs_vnops.c	Wed Dec 15 16:49:47 2010	(r216462)
@@ -1580,6 +1580,11 @@ devfs_symlink(struct vop_symlink_args *a
 	de_covered = devfs_find(dd, de->de_dirent->d_name,
 	    de->de_dirent->d_namlen, 0);
 	if (de_covered != NULL) {
+		if ((de_covered->de_flags & DE_USER) != 0) {
+			devfs_delete(dmp, de, DEVFS_DEL_NORECURSE);
+			sx_xunlock(&dmp->dm_lock);
+			return (EEXIST);
+		}
 		KASSERT((de_covered->de_flags & DE_COVERED) == 0,
 		    ("devfs_symlink: entry %p already covered", de_covered));
 		de_covered->de_flags |= DE_COVERED;