From owner-svn-src-stable@FreeBSD.ORG  Wed May 16 19:47:03 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3E0301065670;
	Wed, 16 May 2012 19:47:03 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2863F8FC0A;
	Wed, 16 May 2012 19:47:03 +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 q4GJl3rI058734;
	Wed, 16 May 2012 19:47:03 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4GJl21w058732;
	Wed, 16 May 2012 19:47:02 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201205161947.q4GJl21w058732@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Wed, 16 May 2012 19:47:02 +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: r235512 - stable/8/sys/security/mac_mls
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 May 2012 19:47:03 -0000

Author: brueffer
Date: Wed May 16 19:47:02 2012
New Revision: 235512
URL: http://svn.freebsd.org/changeset/base/235512

Log:
  MFC: r234957
  
  Check vplabel for NULL before dereferencing it.  Fixes a panic
  when running atop with MAC_MLS enabled.

Modified:
  stable/8/sys/security/mac_mls/mac_mls.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/security/mac_mls/mac_mls.c
==============================================================================
--- stable/8/sys/security/mac_mls/mac_mls.c	Wed May 16 19:25:50 2012	(r235511)
+++ stable/8/sys/security/mac_mls/mac_mls.c	Wed May 16 19:47:02 2012	(r235512)
@@ -1837,6 +1837,9 @@ mls_system_check_acct(struct ucred *cred
 	if (!mls_enabled)
 		return (0);
 
+	if (vplabel == NULL)
+		return (0);
+
 	subj = SLOT(cred->cr_label);
 	obj = SLOT(vplabel);