From owner-svn-src-stable@FreeBSD.ORG  Sun Nov  6 13:35:56 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4303F1065670;
	Sun,  6 Nov 2011 13:35:56 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 328C18FC08;
	Sun,  6 Nov 2011 13:35:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6DZurK023652;
	Sun, 6 Nov 2011 13:35:56 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6DZuDv023650;
	Sun, 6 Nov 2011 13:35:56 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201111061335.pA6DZuDv023650@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 6 Nov 2011 13:35:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227213 - stable/7/sys/fs/devfs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 13:35:56 -0000

Author: kib
Date: Sun Nov  6 13:35:55 2011
New Revision: 227213
URL: http://svn.freebsd.org/changeset/base/227213

Log:
  MFC r227062:
  Fix kernel panic when d_fdopen csw method is called for NULL fp.
  This may happen when kernel consumer calls VOP_OPEN().

Modified:
  stable/7/sys/fs/devfs/devfs_vnops.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- stable/7/sys/fs/devfs/devfs_vnops.c	Sun Nov  6 13:17:37 2011	(r227212)
+++ stable/7/sys/fs/devfs/devfs_vnops.c	Sun Nov  6 13:35:55 2011	(r227213)
@@ -887,6 +887,10 @@ devfs_open(struct vop_open_args *ap)
 	dsw = dev_refthread(dev);
 	if (dsw == NULL)
 		return (ENXIO);
+	if (fp == NULL && dsw->d_fdopen != NULL) {
+		dev_relthread(dev);
+		return (ENXIO);
+	}
 
 	/* XXX: Special casing of ttys for deadfs.  Probably redundant. */
 	if (dsw->d_flags & D_TTY)