From owner-svn-src-all@FreeBSD.ORG  Wed Jun  6 17:04:57 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 0FC2E106566C;
	Wed,  6 Jun 2012 17:04:57 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF2198FC15;
	Wed,  6 Jun 2012 17:04:56 +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 q56H4uB7026932;
	Wed, 6 Jun 2012 17:04:56 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q56H4uGj026930;
	Wed, 6 Jun 2012 17:04:56 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201206061704.q56H4uGj026930@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Wed, 6 Jun 2012 17:04:56 +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: r236689 - head/sys/cam/scsi
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, 06 Jun 2012 17:04:57 -0000

Author: ken
Date: Wed Jun  6 17:04:56 2012
New Revision: 236689
URL: http://svn.freebsd.org/changeset/base/236689

Log:
  Fix a memory leak in the kernel case in scsi_command_string().
  
  Submitted by:	Kashyap Desai <Kashyap.Desai@lsi.com>
  MFC after:	3 days

Modified:
  head/sys/cam/scsi/scsi_all.c

Modified: head/sys/cam/scsi/scsi_all.c
==============================================================================
--- head/sys/cam/scsi/scsi_all.c	Wed Jun  6 16:51:33 2012	(r236688)
+++ head/sys/cam/scsi/scsi_all.c	Wed Jun  6 17:04:56 2012	(r236689)
@@ -3059,6 +3059,10 @@ scsi_command_string(struct cam_device *d
 					    sizeof(cdb_str)));
 	}
 
+#ifdef _KERNEL
+	xpt_free_ccb((union ccb *)cgd);
+#endif
+
 	return(0);
 }