[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160816144538.3181-1-thierry.reding@gmail.com>
Date:	Tue, 16 Aug 2016 16:45:38 +0200
From:	Thierry Reding <thierry.reding@...il.com>
To:	"David S . Miller" <davem@...emloft.net>
Cc:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>,
	Geert Uytterhoeven <geert+renesas@...der.be>,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] net: ipconfig: Fix more use after free
From: Thierry Reding <treding@...dia.com>
While commit 9c706a49d660 ("net: ipconfig: fix use after free") avoids
the use after free, the resulting code still ends up calling both the
ic_setup_if() and ic_setup_routes() after calling ic_close_devs(), and
access to the device is still required.
Move the call to ic_close_devs() to the very end of the function.
Signed-off-by: Thierry Reding <treding@...dia.com>
---
This applies on top of next-20160816.
 net/ipv4/ipconfig.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 66c2fe602810..ba9cbeafbb2e 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1530,12 +1530,14 @@ static int __init ip_auto_config(void)
 	 * Close all network devices except the device we've
 	 * autoconfigured and set up routes.
 	 */
-	ic_close_devs();
 	if (ic_setup_if() < 0 || ic_setup_routes() < 0)
-		return -1;
+		err = -1;
+	else
+		err = 0;
 
+	ic_close_devs();
 
-	return 0;
+	return err;
 }
 
 late_initcall(ip_auto_config);
-- 
2.9.0
Powered by blists - more mailing lists
 
