From owner-svn-src-all@FreeBSD.ORG  Wed Jul 25 12:06:52 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 D18571065686;
	Wed, 25 Jul 2012 12:06:52 +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 BB60C8FC1B;
	Wed, 25 Jul 2012 12:06:52 +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 q6PC6qY4055707;
	Wed, 25 Jul 2012 12:06:52 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PC6qIx055705;
	Wed, 25 Jul 2012 12:06:52 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201207251206.q6PC6qIx055705@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Wed, 25 Jul 2012 12:06:52 +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: r238768 - stable/8/sys/dev/mps
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: Wed, 25 Jul 2012 12:06:52 -0000

Author: brueffer
Date: Wed Jul 25 12:06:52 2012
New Revision: 238768
URL: http://svn.freebsd.org/changeset/base/238768

Log:
  MFC: r238574
  
  Fix a small memory leak in mpssas_get_sata_identify().  The change has
  been submitted upstream as well.

Modified:
  stable/8/sys/dev/mps/mps_sas_lsi.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)

Modified: stable/8/sys/dev/mps/mps_sas_lsi.c
==============================================================================
--- stable/8/sys/dev/mps/mps_sas_lsi.c	Wed Jul 25 11:50:36 2012	(r238767)
+++ stable/8/sys/dev/mps/mps_sas_lsi.c	Wed Jul 25 12:06:52 2012	(r238768)
@@ -796,8 +796,10 @@ mpssas_get_sata_identify(struct mps_soft
 	if (!buffer)
 		return ENOMEM;
 
-	if ((cm = mps_alloc_command(sc)) == NULL)
+	if ((cm = mps_alloc_command(sc)) == NULL) {
+		free(buffer, M_MPT2);
 		return (EBUSY);
+	}
 	mpi_request = (MPI2_SATA_PASSTHROUGH_REQUEST *)cm->cm_req;
 	bzero(mpi_request,sizeof(MPI2_SATA_PASSTHROUGH_REQUEST));
 	mpi_request->Function = MPI2_FUNCTION_SATA_PASSTHROUGH;