Re: [PATCH] net: ifb error path loop fix

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Mariusz Kozlowski
Date: Tuesday, January 2, 2007 - 3:49 am

Hello David, 


Now when I look at it I might be wrong and it is not a bug at all. 
It's just coded in weird way. Anyway isn't there kfree(ifbs) missing
on error path?

The patch below should clear things a bit (against plain 2.6.20-rc2-mm1).

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>

 drivers/net/ifb.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

--- linux-2.6.20-rc2-mm1-a/drivers/net/ifb.c	2006-12-24 05:00:32.000000000 +0100
+++ linux-2.6.20-rc2-mm1-b/drivers/net/ifb.c	2007-01-02 11:35:48.000000000 +0100
@@ -264,18 +264,22 @@ static void ifb_free_one(int index)

 static int __init ifb_init_module(void)
 {
-	int i, err = 0;
+	int i, err;
+
 	ifbs = kmalloc(numifbs * sizeof(void *), GFP_KERNEL);
 	if (!ifbs)
 		return -ENOMEM;
-	for (i = 0; i < numifbs && !err; i++)
+	for (i = 0; i < numifbs; i++) {
 		err = ifb_init_one(i);
-	if (err) {
-		i--;
-		while (--i >= 0)
-			ifb_free_one(i);
+		if (err)
+			goto err;
 	}
+	return 0;

+err:
+	while (i--)
+		ifb_free_one(i);
+	kfree(ifbs);
 	return err;
 }



-- 
Regards,

	Mariusz Kozlowski
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] net: ifb error path loop fix, Mariusz Kozlowski, (Mon Jan 1, 4:55 pm)
Re: [PATCH] net: ifb error path loop fix, David Miller, (Tue Jan 2, 12:51 am)
Re: [PATCH] net: ifb error path loop fix, Jarek Poplawski, (Tue Jan 2, 3:30 am)
Re: [PATCH] net: ifb error path loop fix, Mariusz Kozlowski, (Tue Jan 2, 3:49 am)
Re: [PATCH] net: ifb error path loop fix, David Miller, (Tue Jan 2, 4:20 pm)