| Message ID | 1470822257-13275-1-git-send-email-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Uwe, On Wed, Aug 10, 2016 at 11:44 AM, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > ic_close_devs() calls kfree() for all devices's ic_device. Since commit > 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") > the active device's ic_device is still used however to print the > ipconfig summary which results in an oops if the memory is already > changed. So delay freeing until after the autoconfig results are > reported. Thanks! > Fixes: 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
From: Geert Uytterhoeven <geert@linux-m68k.org> Date: Wed, 10 Aug 2016 12:00:35 +0200 > Hi Uwe, > > On Wed, Aug 10, 2016 at 11:44 AM, Uwe Kleine-König > <u.kleine-koenig@pengutronix.de> wrote: >> ic_close_devs() calls kfree() for all devices's ic_device. Since commit >> 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") >> the active device's ic_device is still used however to print the >> ipconfig summary which results in an oops if the memory is already >> changed. So delay freeing until after the autoconfig results are >> reported. > > Thanks! > >> Fixes: 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") >> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Applied, thanks everyone.
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 42cf629357b5..66c2fe602810 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1493,14 +1493,6 @@ static int __init ip_auto_config(void) return -1; /* - * 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; - - /* * Record which protocol was actually used. */ #ifdef IPCONFIG_DYNAMIC @@ -1534,6 +1526,15 @@ static int __init ip_auto_config(void) pr_cont("\n"); #endif /* !SILENT */ + /* + * 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; + + return 0; }
ic_close_devs() calls kfree() for all devices's ic_device. Since commit 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") the active device's ic_device is still used however to print the ipconfig summary which results in an oops if the memory is already changed. So delay freeing until after the autoconfig results are reported. Fixes: 2647cffb2bc6 ("net: ipconfig: Support using "delayed" DHCP replies") Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- net/ipv4/ipconfig.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)