From owner-svn-src-head@freebsd.org  Mon Oct  1 19:00:47 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7550110A793E;
 Mon,  1 Oct 2018 19:00:47 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C3B088581;
 Mon,  1 Oct 2018 19:00:47 +0000 (UTC) (envelope-from ken@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2729624E80;
 Mon,  1 Oct 2018 19:00:47 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w91J0knN026307;
 Mon, 1 Oct 2018 19:00:46 GMT (envelope-from ken@FreeBSD.org)
Received: (from ken@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w91J0kpj026306;
 Mon, 1 Oct 2018 19:00:46 GMT (envelope-from ken@FreeBSD.org)
Message-Id: <201810011900.w91J0kpj026306@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ken set sender to ken@FreeBSD.org
 using -f
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Mon, 1 Oct 2018 19:00:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r339076 - head/sys/cam/scsi
X-SVN-Group: head
X-SVN-Commit-Author: ken
X-SVN-Commit-Paths: head/sys/cam/scsi
X-SVN-Commit-Revision: 339076
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2018 19:00:47 -0000

Author: ken
Date: Mon Oct  1 19:00:46 2018
New Revision: 339076
URL: https://svnweb.freebsd.org/changeset/base/339076

Log:
  Fix a da(4) driver memory leak for SCSI SMR devices.
  
  In the probe case for SCSI SMR Host Aware or Most Managed drives, be sure
  to free allocated memory.
  
  sys/cam/scsi/scsi_da.c:
  	In dadone_probezone(), free the data pointer before returning.
  
  MFC after:	3 days
  Sponsored by:	Spectra Logic
  Approved by:	re (kib)

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

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Mon Oct  1 18:51:39 2018	(r339075)
+++ head/sys/cam/scsi/scsi_da.c	Mon Oct  1 19:00:46 2018	(r339076)
@@ -5674,6 +5674,9 @@ dadone_probezone(struct cam_periph *periph, union ccb 
 			}
 		}
 	}
+
+	free(csio->data_ptr, M_SCSIDA);
+
 	daprobedone(periph, done_ccb);
 	return;
 }