From owner-svn-src-all@FreeBSD.ORG  Sat Nov 16 10:49:02 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E9E91A89;
 Sat, 16 Nov 2013 10:49:02 +0000 (UTC)
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 D95912A0D;
 Sat, 16 Nov 2013 10:49:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGAn2fv059949;
 Sat, 16 Nov 2013 10:49:02 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGAn2ct059948;
 Sat, 16 Nov 2013 10:49:02 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201311161049.rAGAn2ct059948@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 16 Nov 2013 10:49:02 +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: r258219 - stable/9/sys/dev/ata/chipsets
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
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/options/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: Sat, 16 Nov 2013 10:49:03 -0000

Author: mav
Date: Sat Nov 16 10:49:02 2013
New Revision: 258219
URL: http://svnweb.freebsd.org/changeset/base/258219

Log:
  MFC r253644:
  Add missing NULL check after malloc(M_NOWAIT).

Modified:
  stable/9/sys/dev/ata/chipsets/ata-promise.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ata/chipsets/ata-promise.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-promise.c	Sat Nov 16 10:47:58 2013	(r258218)
+++ stable/9/sys/dev/ata/chipsets/ata-promise.c	Sat Nov 16 10:49:02 2013	(r258219)
@@ -288,6 +288,10 @@ ata_promise_chipinit(device_t dev)
 	    /* setup host packet controls */
 	    hpkt = malloc(sizeof(struct ata_promise_sx4),
 			  M_ATAPCI, M_NOWAIT | M_ZERO);
+	    if (hpkt == NULL) {
+		device_printf(dev, "Cannot allocate HPKT\n");
+		goto failnfree;
+	    }
 	    mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF);
 	    TAILQ_INIT(&hpkt->queue);
 	    hpkt->busy = 0;