net: ipconfig: Fix NULL pointer dereference on RARP/BOOTP/DHCP timeout
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 22 Aug 2016 13:01:03 +0000 (15:01 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Aug 2016 04:04:41 +0000 (21:04 -0700)
If no RARP, BOOTP, or DHCP response is received, ic_dev is never set,
causing a NULL pointer dereference in ic_close_devs():

    Sending DHCP requests ...... timed out!
    Unable to handle kernel NULL pointer dereference at virtual address 00000004

To fix this, add a check to avoid dereferencing ic_dev if it is still
NULL.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: 2647cffb2bc6fbed ("net: ipconfig: Support using "delayed" DHCP replies")
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipconfig.c

index ba9cbeafbb2e081706c40e6236762b411f7ef1f7..071a785c65eb7ab5eef6294888e253ef39f45c45 100644 (file)
@@ -306,7 +306,7 @@ static void __init ic_close_devs(void)
        while ((d = next)) {
                next = d->next;
                dev = d->dev;
-               if (dev != ic_dev->dev && !netdev_uses_dsa(dev)) {
+               if ((!ic_dev || dev != ic_dev->dev) && !netdev_uses_dsa(dev)) {
                        pr_debug("IP-Config: Downing %s\n", dev->name);
                        dev_change_flags(dev, d->flags);
                }