Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 May 2016 06:26:42 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299592 - head/usr.sbin/mptutil
Message-ID:  <201605130626.u4D6QgxQ024581@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Fri May 13 06:26:42 2016
New Revision: 299592
URL: https://svnweb.freebsd.org/changeset/base/299592

Log:
  Move a call to cam_freeccb() to avoid a use after free error and
  a later double free.
  
  Reported by:	Coverity
  CID:		1018507
  MFC after:	1 week

Modified:
  head/usr.sbin/mptutil/mpt_cam.c

Modified: head/usr.sbin/mptutil/mpt_cam.c
==============================================================================
--- head/usr.sbin/mptutil/mpt_cam.c	Fri May 13 06:15:05 2016	(r299591)
+++ head/usr.sbin/mptutil/mpt_cam.c	Fri May 13 06:26:42 2016	(r299592)
@@ -260,7 +260,6 @@ fetch_scsi_capacity(struct cam_device *d
 		cam_freeccb(ccb);
 		return (EIO);
 	}
-	cam_freeccb(ccb);
 
 	/*
 	 * A last block of 2^32-1 means that the true capacity is over 2TB,
@@ -269,6 +268,7 @@ fetch_scsi_capacity(struct cam_device *d
 	 */
 	if (scsi_4btoul(rcap.addr) != 0xffffffff) {
 		disk->maxlba = scsi_4btoul(rcap.addr);
+		cam_freeccb(ccb);
 		return (0);
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605130626.u4D6QgxQ024581>