From owner-svn-src-stable-10@freebsd.org  Thu May 12 12:03:28 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 942A6B2E9E8;
 Thu, 12 May 2016 12:03:28 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64B801C00;
 Thu, 12 May 2016 12:03:28 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CC3RAg090310;
 Thu, 12 May 2016 12:03:27 GMT (envelope-from scottl@FreeBSD.org)
Received: (from scottl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CC3RCv090309;
 Thu, 12 May 2016 12:03:27 GMT (envelope-from scottl@FreeBSD.org)
Message-Id: <201605121203.u4CC3RCv090309@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: scottl set sender to
 scottl@FreeBSD.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Thu, 12 May 2016 12:03:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r299531 - stable/10/sys/cam
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2016 12:03:28 -0000

Author: scottl
Date: Thu May 12 12:03:27 2016
New Revision: 299531
URL: https://svnweb.freebsd.org/changeset/base/299531

Log:
  MFC r298977: Fix a memory leak introduced with the devctl intergration of
  cam_periph

Modified:
  stable/10/sys/cam/cam_periph.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/cam_periph.c
==============================================================================
--- stable/10/sys/cam/cam_periph.c	Thu May 12 11:38:28 2016	(r299530)
+++ stable/10/sys/cam/cam_periph.c	Thu May 12 12:03:27 2016	(r299531)
@@ -1876,6 +1876,7 @@ cam_periph_devctl_notify(union ccb *ccb)
 
 		if (cgd->ccb_h.status == CAM_REQ_CMP)
 			sbuf_bcat(&sb, cgd->serial_num, cgd->serial_num_len);
+		xpt_free_ccb((union ccb *)cgd);
 	}
 	sbuf_printf(&sb, "\" ");
 	sbuf_printf(&sb, "cam_status=\"0x%x\" ", ccb->ccb_h.status);