From owner-p4-projects@FreeBSD.ORG  Sun Jun 14 12:02:22 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E5DB3106567E; Sun, 14 Jun 2009 12:02:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B0FA1065706
	for <perforce@freebsd.org>; Sun, 14 Jun 2009 12:02:21 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 32E5D8FC1E
	for <perforce@freebsd.org>; Sun, 14 Jun 2009 12:02:21 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5EC2LPf001120
	for <perforce@freebsd.org>; Sun, 14 Jun 2009 12:02:21 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5EC2LO1001118
	for perforce@freebsd.org; Sun, 14 Jun 2009 12:02:21 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 14 Jun 2009 12:02:21 GMT
Message-Id: <200906141202.n5EC2LO1001118@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164329 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 12:02:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=164329

Change 164329 by mav@mav_mavbook on 2009/06/14 12:01:41

	Plug paths leak on bus scan.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#20 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#20 (text+ko) ====

@@ -1213,13 +1213,12 @@
 		work_ccb = request_ccb;
 		/* Reuse the same CCB to query if a device was really found */
 		scan_info = (ata_scan_bus_info *)work_ccb->ccb_h.ppriv_ptr0;
-
-		/*
-		 * Free the current request path- we're done with it.
-		 */
+		/* Free the current request path- we're done with it. */
 		xpt_free_path(work_ccb->ccb_h.path);
+		/* If there is PM... */
 		if (scan_info->counter == 15 &&
 		    work_ccb->ccb_h.ppriv_field1 != 0) {
+			/* Save PM probe result. */
 			scan_info->found = work_ccb->ccb_h.ppriv_field1;
 			/* Report SIM that PM is present. */
 			bzero(&cts, sizeof(cts));
@@ -1260,6 +1259,7 @@
 		}
 		if ((scan_info->found & (1 << scan_info->counter)) == 0) {
 			xpt_async(AC_LOST_DEVICE, path, NULL);
+			xpt_free_path(path);
 			goto take_next;
 		}
 		xpt_setup_ccb(&work_ccb->ccb_h, path,