From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264386AbUFPSCD (ORCPT ); Wed, 16 Jun 2004 14:02:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264373AbUFPR7l (ORCPT ); Wed, 16 Jun 2004 13:59:41 -0400 Received: from mail.fh-wedel.de ([213.39.232.194]:33185 "EHLO mail.fh-wedel.de") by vger.kernel.org with ESMTP id S264368AbUFPR6L (ORCPT ); Wed, 16 Jun 2004 13:58:11 -0400 Date: Wed, 16 Jun 2004 19:57:30 +0200 From: =?iso-8859-1?Q?J=F6rn?= Engel To: "Randy.Dunlap" Cc: jolt@tuxbox.org, akpm@osdl.org, B.Zolnierkiewicz@elka.pw.edu.pl, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] [STACK] reduce >3k call path in ide Message-ID: <20040616175730.GA15365@wohnheim.fh-wedel.de> References: <20040609122921.GG21168@wohnheim.fh-wedel.de> <20040615163445.6b886383.rddunlap@osdl.org> <200406160911.11985.jolt@tuxbox.org> <20040616094737.GA2548@wohnheim.fh-wedel.de> <40D01928.1080309@tuxbox.org> <20040616100008.GB2548@wohnheim.fh-wedel.de> <20040616103741.042f8029.rddunlap@osdl.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20040616103741.042f8029.rddunlap@osdl.org> User-Agent: Mutt/1.3.28i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 16 June 2004 10:37:41 -0700, Randy.Dunlap wrote: > > Thanks for the helpful comments. Here's a corrected patch. Looks, as if it still leaks memory: > > link->state &= ~DEV_CONFIG_PENDING; about here. > return; > - > + > cs_failed: > cs_error(link->handle, last_fn, last_ret); > failed: > ide_release(link); > link->state &= ~DEV_CONFIG_PENDING; > + return; > > + /* memory allocation errors */ > +err_kfree: > + kfree(cfginfo); > + kfree(def_cte); > + kfree(tbuf); > + printk(KERN_NOTICE "ide-cs: ide_config failed memory allocation\n"); > + goto failed; > } /* ide_config */ > > /*====================================================================== Jörn -- Schrödinger's cat is not dead. -- Illiad