From owner-svn-src-head@freebsd.org  Tue Apr 26 21:44:10 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3332AB1C216;
 Tue, 26 Apr 2016 21:44:10 +0000 (UTC) (envelope-from cem@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 0483A1038;
 Tue, 26 Apr 2016 21:44:09 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QLi9mv061167;
 Tue, 26 Apr 2016 21:44:09 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QLi9ZX061166;
 Tue, 26 Apr 2016 21:44:09 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201604262144.u3QLi9ZX061166@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Tue, 26 Apr 2016 21:44:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298669 - head/sys/dev/iscsi_initiator
X-SVN-Group: head
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.21
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: Tue, 26 Apr 2016 21:44:10 -0000

Author: cem
Date: Tue Apr 26 21:44:08 2016
New Revision: 298669
URL: https://svnweb.freebsd.org/changeset/base/298669

Log:
  iscsi_initiator(4): Fix use-after-free, double-free
  
  ism_stop() already destroys and frees 'sp', including a call to ic_destroy().
  Don't dereference 'sp' after ism_stop() and don't invoke ic_destroy() on the
  freed memory either.
  
  Reported by:	Coverity
  CIDs:		1006109, 1304861
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/iscsi_initiator/iscsi.c

Modified: head/sys/dev/iscsi_initiator/iscsi.c
==============================================================================
--- head/sys/dev/iscsi_initiator/iscsi.c	Tue Apr 26 21:19:12 2016	(r298668)
+++ head/sys/dev/iscsi_initiator/iscsi.c	Tue Apr 26 21:44:08 2016	(r298669)
@@ -804,8 +804,6 @@ iscsi_stop(void)
      TAILQ_FOREACH_SAFE(sp, &isc->isc_sess, sp_link, sp_tmp) {
 	  //XXX: check for activity ...
 	  ism_stop(sp);
-	  if(sp->cam_sim != NULL)
-	       ic_destroy(sp);
      }
      mtx_destroy(&isc->isc_mtx);
      sx_destroy(&isc->unit_sx);