From owner-svn-src-stable-8@FreeBSD.ORG  Fri May 25 23:24:17 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 644EA106564A;
	Fri, 25 May 2012 23:24:17 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D3DD8FC0C;
	Fri, 25 May 2012 23:24:17 +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 q4PNOHve039125;
	Fri, 25 May 2012 23:24:17 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4PNOHSw039123;
	Fri, 25 May 2012 23:24:17 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201205252324.q4PNOHSw039123@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 25 May 2012 23:24:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236030 - stable/8/sys/kern
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 May 2012 23:24:17 -0000

Author: rstone
Date: Fri May 25 23:24:16 2012
New Revision: 236030
URL: http://svn.freebsd.org/changeset/base/236030

Log:
  MFC r227342
  
   The in-kernel CTF parser caches the result of its first attempt to parse
   CTF data from a module.  On subsequent attempts to retrieve CTF data for
   a module, return an error if there no CTF data.
  
   This fixes a panic if you try to enable fbt probes on a module without CTF
   data twice.
  
  Submitted by:	Paul Ambrose (ambrosehua AT gmail DOT com)

Modified:
  stable/8/sys/kern/kern_ctf.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/kern/kern_ctf.c
==============================================================================
--- stable/8/sys/kern/kern_ctf.c	Fri May 25 22:42:21 2012	(r236029)
+++ stable/8/sys/kern/kern_ctf.c	Fri May 25 23:24:16 2012	(r236030)
@@ -90,7 +90,7 @@ link_elf_ctf_get(linker_file_t lf, linke
 	 * ctfcnt to -1. See below.
 	 */
 	if (ef->ctfcnt < 0)
-		return (0);
+		return (EFTYPE);
 
 	/* Now check if we've already loaded the CTF data.. */
 	if (ef->ctfcnt > 0) {