Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751220AbWA3BYH (ORCPT ); Sun, 29 Jan 2006 20:24:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751218AbWA3BYH (ORCPT ); Sun, 29 Jan 2006 20:24:07 -0500 Received: from perninha.conectiva.com.br ([200.140.247.100]:36224 "EHLO perninha.conectiva.com.br") by vger.kernel.org with ESMTP id S1751215AbWA3BYF (ORCPT ); Sun, 29 Jan 2006 20:24:05 -0500 Date: Sun, 29 Jan 2006 23:21:28 -0200 From: Luiz Fernando Capitulino To: davem Cc: lkml , netdev@vger.kernel.org, robert.olsson@its.uu.se Subject: [PATCH 4/4] pktgen: Fix Initialization fail leak. Message-ID: <20060129232128.44e6022b@localhost> Organization: Mandriva X-Mailer: Sylpheed-Claws 1.0.4 (GTK+ 1.2.10; x86_64-mandriva-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1587 Lines: 58 Even if pktgen's thread initialization fails for all CPUs, the module will be successfully loaded. This patch changes that behaivor, by returning error on module load time, and also freeing all the resources allocated. It also prints a warning if a thread initialization has failed. Signed-off-by: Luiz Capitulino --- net/core/pktgen.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) 909df2e921dabd2f43f80f4fe067bf3b86fbc3cd diff --git a/net/core/pktgen.c b/net/core/pktgen.c index af310e5..3806068 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3136,11 +3136,24 @@ static int __init pg_init(void) register_netdevice_notifier(&pktgen_notifier_block); for_each_online_cpu(cpu) { + int err; char buf[30]; sprintf(buf, "kpktgend_%i", cpu); - pktgen_create_thread(buf, cpu); + err = pktgen_create_thread(buf, cpu); + if (err) + printk("pktgen: WARNING: Cannot create thread for cpu %d (%d)\n", + cpu, err); } + + if (list_empty(&pktgen_threads)) { + printk("pktgen: ERROR: Initialization failed for all threads\n"); + unregister_netdevice_notifier(&pktgen_notifier_block); + remove_proc_entry(PGCTRL, pg_proc_dir); + proc_net_remove(PG_PROC_DIR); + return -ENODEV; + } + return 0; } -- 1.1.5.g3480 -- Luiz Fernando N. Capitulino - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/