From owner-svn-src-head@FreeBSD.ORG  Fri Jun 14 02:25:41 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 66298380;
 Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5746818E6;
 Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E2Pffg016490;
 Fri, 14 Jun 2013 02:25:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E2Pfhw016489;
 Fri, 14 Jun 2013 02:25:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306140225.r5E2Pfhw016489@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 14 Jun 2013 02:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251725 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 14 Jun 2013 02:25:41 -0000

Author: lstewart
Date: Fri Jun 14 02:25:40 2013
New Revision: 251725
URL: http://svnweb.freebsd.org/changeset/base/251725

Log:
  Fix a potential NULL-pointer dereference that would trigger if the hhook
  registration site did not provide storage for a copy of the hhook_head struct.
  
  MFC after:	3 days

Modified:
  head/sys/kern/kern_hhook.c

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Fri Jun 14 02:21:32 2013	(r251724)
+++ head/sys/kern/kern_hhook.c	Fri Jun 14 02:25:40 2013	(r251725)
@@ -264,9 +264,10 @@ hhook_head_register(int32_t hhook_type, 
 	STAILQ_INIT(&tmphhh->hhh_hooks);
 	HHH_LOCK_INIT(tmphhh);
 
-	if (hhh != NULL)
+	if (hhh != NULL) {
 		refcount_init(&tmphhh->hhh_refcount, 1);
-	else
+		*hhh = tmphhh;
+	} else
 		refcount_init(&tmphhh->hhh_refcount, 0);
 
 	if (flags & HHOOK_HEADISINVNET) {
@@ -278,8 +279,6 @@ hhook_head_register(int32_t hhook_type, 
 		/* XXXLAS: Add tmphhh to the non-virtualised list. */
 	}
 
-	*hhh = tmphhh;
-
 	return (0);
 }