From owner-svn-src-stable@FreeBSD.ORG  Tue Sep 24 12:48:03 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 40AC0880;
 Tue, 24 Sep 2013 12:48:03 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2DC862A74;
 Tue, 24 Sep 2013 12:48:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8OCm3e4074646;
 Tue, 24 Sep 2013 12:48:03 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8OCm3R5074645;
 Tue, 24 Sep 2013 12:48:03 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201309241248.r8OCm3R5074645@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 24 Sep 2013 12:48:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r255846 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 24 Sep 2013 12:48:03 -0000

Author: trasz
Date: Tue Sep 24 12:48:02 2013
New Revision: 255846
URL: http://svnweb.freebsd.org/changeset/base/255846

Log:
  MFC r254135:
  
  Don't dereference null pointer should acl_alloc() be passed M_NOWAIT
  and allocation failed.  Nothing in the tree passed M_NOWAIT.

Modified:
  stable/9/sys/kern/vfs_acl.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_acl.c
==============================================================================
--- stable/9/sys/kern/vfs_acl.c	Tue Sep 24 12:26:43 2013	(r255845)
+++ stable/9/sys/kern/vfs_acl.c	Tue Sep 24 12:48:02 2013	(r255846)
@@ -564,6 +564,9 @@ acl_alloc(int flags)
 	struct acl *aclp;
 
 	aclp = malloc(sizeof(*aclp), M_ACL, flags);
+	if (aclp == NULL)
+		return (NULL);
+
 	aclp->acl_maxcnt = ACL_MAX_ENTRIES;
 
 	return (aclp);