[PATCH 4/6] pktgen: Fix Initialization fail leak.

From: Luiz Fernando Capitulino
Date: Sat Feb 25 2006 - 14:05:50 EST



Even if pktgen's thread initialization fails for all CPUs, the module
will be successfully loaded.

This patch changes that behaivor, by returning an 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 <lcapitulino@xxxxxxxxxxxxxxx>

---

net/core/pktgen.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)

7084c4ee538fcac59f0d9f64c840c45f8caeab8f
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 1c565fe..89480e3 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3216,11 +3216,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.2.1.g3397f9



--
Luiz Fernando N. Capitulino
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/