From owner-svn-src-head@FreeBSD.ORG  Mon Jan 26 14:21:00 2009
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 922D41065672;
	Mon, 26 Jan 2009 14:21:00 +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 803DA8FC21;
	Mon, 26 Jan 2009 14:21:00 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QEL0SE052502;
	Mon, 26 Jan 2009 14:21:00 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0QEL08q052501;
	Mon, 26 Jan 2009 14:21:00 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200901261421.n0QEL08q052501@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 26 Jan 2009 14:21:00 +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: r187715 - head/sys/fs/fifofs
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: Mon, 26 Jan 2009 14:21:01 -0000

Author: kib
Date: Mon Jan 26 14:21:00 2009
New Revision: 187715
URL: http://svn.freebsd.org/changeset/base/187715

Log:
  The kernel may do unbalanced calls to fifo_close() for fifo vnode,
  without corresponding number of fifo_open(). This causes assertion
  failure in fifo_close() due to vp->v_fifoinfo being NULL for kernel
  with INVARIANTS, or NULL pointer dereference otherwise. In fact, we may
  ignore excess calls to fifo_close() without bad consequences.
  
  Turn KASSERT() into the return, and print warning for now.
  
  Tested by:	pho
  Reviewed by:	rwatson
  MFC after:	2 weeks

Modified:
  head/sys/fs/fifofs/fifo_vnops.c

Modified: head/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- head/sys/fs/fifofs/fifo_vnops.c	Mon Jan 26 14:12:12 2009	(r187714)
+++ head/sys/fs/fifofs/fifo_vnops.c	Mon Jan 26 14:21:00 2009	(r187715)
@@ -423,7 +423,10 @@ fifo_close(ap)
 	struct fifoinfo *fip = vp->v_fifoinfo;
 
 	ASSERT_VOP_LOCKED(vp, "fifo_close");
-	KASSERT(fip != NULL, ("fifo_close: no v_fifoinfo"));
+	if (fip == NULL) {
+		printf("fifo_close: no v_fifoinfo %p\n", vp);
+		return (0);
+	}
 	if (ap->a_fflag & FREAD) {
 		fip->fi_readers--;
 		if (fip->fi_readers == 0)