From owner-svn-src-head@FreeBSD.ORG  Tue Jan 21 23:15:24 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DFBC310;
 Tue, 21 Jan 2014 23:15:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A1B21376;
 Tue, 21 Jan 2014 23:15:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0LNFOEm010294;
 Tue, 21 Jan 2014 23:15:24 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0LNFOEX010293;
 Tue, 21 Jan 2014 23:15:24 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201401212315.s0LNFOEX010293@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 21 Jan 2014 23:15:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260996 - head/sys/cam
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jan 2014 23:15:24 -0000

Author: mav
Date: Tue Jan 21 23:15:23 2014
New Revision: 260996
URL: http://svnweb.freebsd.org/changeset/base/260996

Log:
  Fix memory and references leak due to unfreed path in case we can't
  allocate bus scan CCB.
  
  MFC after:	2 weeks

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Tue Jan 21 21:30:44 2014	(r260995)
+++ head/sys/cam/cam_xpt.c	Tue Jan 21 23:15:23 2014	(r260996)
@@ -3919,9 +3919,11 @@ xpt_bus_register(struct cam_sim *sim, de
 				scan_ccb->ccb_h.func_code = XPT_SCAN_BUS;
 				scan_ccb->crcn.flags = 0;
 				xpt_rescan(scan_ccb);
-			} else
+			} else {
 				xpt_print(path,
 					  "Can't allocate CCB to scan bus\n");
+				xpt_free_path(path);
+			}
 		} else
 			xpt_free_path(path);
 	} else