From owner-svn-src-head@FreeBSD.ORG  Thu May 12 10:56:34 2011
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 0A2741065674;
	Thu, 12 May 2011 10:56:34 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5E98FC16;
	Thu, 12 May 2011 10:56:33 +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 p4CAuXJZ034119;
	Thu, 12 May 2011 10:56:33 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4CAuXpu034117;
	Thu, 12 May 2011 10:56:33 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201105121056.p4CAuXpu034117@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Thu, 12 May 2011 10:56:33 +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: r221808 - head/sys/kern
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: Thu, 12 May 2011 10:56:34 -0000

Author: stas
Date: Thu May 12 10:56:33 2011
New Revision: 221808
URL: http://svn.freebsd.org/changeset/base/221808

Log:
  - Do no try to drop a NULL filedesc pointer.

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Thu May 12 10:11:39 2011	(r221807)
+++ head/sys/kern/kern_descrip.c	Thu May 12 10:56:33 2011	(r221808)
@@ -3224,7 +3224,8 @@ sysctl_kern_proc_filedesc(SYSCTL_HANDLER
 	}
 	FILEDESC_SUNLOCK(fdp);
 fail:
-	fddrop(fdp);
+	if (fdp != NULL)
+		fddrop(fdp);
 	free(kif, M_TEMP);
 	return (error);
 }