From owner-cvs-src@FreeBSD.ORG Tue Jan 17 16:10:20 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 979EE16A471; Tue, 17 Jan 2006 16:10:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD43543D45; Tue, 17 Jan 2006 16:10:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 6274674 for multiple; Tue, 17 Jan 2006 11:08:42 -0500 Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k0HGA3La038589; Tue, 17 Jan 2006 11:10:03 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Doug Rabson Date: Tue, 17 Jan 2006 11:11:00 -0500 User-Agent: KMail/1.9.1 References: <200512202106.jBKL6hNr035186@repoman.freebsd.org> <1CDDC33C-01D5-4AFE-99C0-DE848321D78B@nlsystems.com> In-Reply-To: <1CDDC33C-01D5-4AFE-99C0-DE848321D78B@nlsystems.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200601171111.01942.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1244/Tue Jan 17 03:46:07 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/pci agp.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2006 16:10:20 -0000 On Tuesday 17 January 2006 06:51, Doug Rabson wrote: > On 20 Dec 2005, at 21:06, John Baldwin wrote: > > jhb 2005-12-20 21:06:43 UTC > > > > FreeBSD src repository > > > > Modified files: > > sys/pci agp.c > > Log: > > Change the agp_find_device() to return the first agp device that > > has been > > attached to a driver rather than always returning agp0. > > According to Coverity, this introduces a memory leak > (devclass_get_devices() allocates memory). That it does. How about this fix: Index: pci/agp.c =================================================================== RCS file: /usr/cvs/src/sys/pci/agp.c,v retrieving revision 1.50 diff -u -r1.50 agp.c --- pci/agp.c 20 Dec 2005 21:06:43 -0000 1.50 +++ pci/agp.c 17 Jan 2006 16:10:20 -0000 @@ -830,18 +830,22 @@ device_t agp_find_device() { - device_t *children; + device_t *children, child; int i, count; if (!agp_devclass) return NULL; if (devclass_get_devices(agp_devclass, &children, &count) != 0) return NULL; + child = NULL; for (i = 0; i < count; i++) { - if (device_is_attached(children[i])) - return (children[i]); + if (device_is_attached(children[i])) { + child = children[i]; + break; + } } - return NULL; + free(children, M_TEMP); + return child; } enum agp_acquire_state -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org