From owner-svn-src-all@FreeBSD.ORG  Thu May  3 15:51:34 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C00AA1065686;
	Thu,  3 May 2012 15:51:34 +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 AAD618FC16;
	Thu,  3 May 2012 15:51:34 +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 q43FpY17049899;
	Thu, 3 May 2012 15:51:34 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q43FpYBr049897;
	Thu, 3 May 2012 15:51:34 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201205031551.q43FpYBr049897@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Thu, 3 May 2012 15:51:34 +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: r234957 - head/sys/security/mac_mls
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: Thu, 03 May 2012 15:51:34 -0000

Author: brueffer
Date: Thu May  3 15:51:34 2012
New Revision: 234957
URL: http://svn.freebsd.org/changeset/base/234957

Log:
  Check vplabel for NULL before dereferencing it.  Fixes a panic
  when running atop with MAC_MLS enabled.
  
  Submitted by:	Richard Kojedzinszky <krichy@tvnetwork.hu>
  Reviewed by:	rwatson
  MFC after:	1 week

Modified:
  head/sys/security/mac_mls/mac_mls.c

Modified: head/sys/security/mac_mls/mac_mls.c
==============================================================================
--- head/sys/security/mac_mls/mac_mls.c	Thu May  3 15:37:05 2012	(r234956)
+++ head/sys/security/mac_mls/mac_mls.c	Thu May  3 15:51:34 2012	(r234957)
@@ -2028,6 +2028,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);