net: ipconfig: Fix more use after free

While commit 9c706a49d6 ("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@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thierry Reding 2016-08-16 16:45:38 +02:00 committed by David S. Miller
parent 00062a934b
commit d2d371ae5d
1 changed files with 5 additions and 3 deletions

View File

@ -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);