From owner-svn-src-all@FreeBSD.ORG  Mon May 31 09:10:40 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02EB21065673;
	Mon, 31 May 2010 09:10:40 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E67918FC17;
	Mon, 31 May 2010 09:10:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V9AdHW021450;
	Mon, 31 May 2010 09:10:39 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4V9AdQU021448;
	Mon, 31 May 2010 09:10:39 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201005310910.o4V9AdQU021448@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 31 May 2010 09:10:39 +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: r208672 - head/sys/geom/label
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 May 2010 09:10:40 -0000

Author: avg
Date: Mon May 31 09:10:39 2010
New Revision: 208672
URL: http://svn.freebsd.org/changeset/base/208672

Log:
  g_label: fix possible NULL pointer dereference
  
  in case glabel debug level is >= 1 and gp->provider list is empty
  for some reason
  
  Found by:	clang static analyzer
  MFC after:	4 days

Modified:
  head/sys/geom/label/g_label.c

Modified: head/sys/geom/label/g_label.c
==============================================================================
--- head/sys/geom/label/g_label.c	Mon May 31 09:08:44 2010	(r208671)
+++ head/sys/geom/label/g_label.c	Mon May 31 09:10:39 2010	(r208672)
@@ -203,10 +203,8 @@ g_label_destroy(struct g_geom *gp, boole
 			    pp->acr, pp->acw, pp->ace);
 			return (EBUSY);
 		}
-	} else {
-		G_LABEL_DEBUG(1, "Label %s removed.",
-		    LIST_FIRST(&gp->provider)->name);
-	}
+	} else if (pp != NULL)
+		G_LABEL_DEBUG(1, "Label %s removed.", pp->name);
 	g_slice_spoiled(LIST_FIRST(&gp->consumer));
 	return (0);
 }