From owner-svn-src-head@freebsd.org  Wed May 11 22:22:51 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 0717AB38374;
 Wed, 11 May 2016 22:22:51 +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 BEC45179C;
 Wed, 11 May 2016 22:22:50 +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 u4BMMnF1041610;
 Wed, 11 May 2016 22:22:49 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BMMnMP041609;
 Wed, 11 May 2016 22:22:49 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201605112222.u4BMMnMP041609@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: Wed, 11 May 2016 22:22:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299489 - head/sbin/camcontrol
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.22
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: Wed, 11 May 2016 22:22:51 -0000

Author: cem
Date: Wed May 11 22:22:49 2016
New Revision: 299489
URL: https://svnweb.freebsd.org/changeset/base/299489

Log:
  camcontrol(8): Fix trival double-free
  
  Reported by:	Coverity
  CID:		1331223
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Wed May 11 22:13:50 2016	(r299488)
+++ head/sbin/camcontrol/camcontrol.c	Wed May 11 22:22:49 2016	(r299489)
@@ -4994,6 +4994,7 @@ dev_has_vpd_page(struct cam_device *dev,
 
 	if (cam_send_ccb(dev, ccb) < 0) {
 		cam_freeccb(ccb);
+		ccb = NULL;
 		retval = -1;
 		goto bailout;
 	}