net: fec: ptp: fix NULL pointer dereference if ptp_clock is not set
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 22 Oct 2014 14:34:35 +0000 (16:34 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Oct 2014 21:48:06 +0000 (17:48 -0400)
Since commit 278d24047891 (net: fec: ptp: Enable PPS output based on ptp clock)
fec_enet_interrupt calls fec_ptp_check_pps_event unconditionally, which calls
into ptp_clock_event. If fep->ptp_clock is NULL, ptp_clock_event tries to
dereference the NULL pointer.
Since on i.MX53 fep->bufdesc_ex is not set, fec_ptp_init is never called,
and fep->ptp_clock is NULL, which reliably causes a kernel panic.

This patch adds a check for fep->ptp_clock == NULL in fec_enet_interrupt.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec_main.c

index 81b96cf875740f6faa418885718dcc78c2113570..50a851db2852e28979a0b78f481347fc9e29778a 100644 (file)
@@ -1581,7 +1581,8 @@ fec_enet_interrupt(int irq, void *dev_id)
                complete(&fep->mdio_done);
        }
 
-       fec_ptp_check_pps_event(fep);
+       if (fep->ptp_clock)
+               fec_ptp_check_pps_event(fep);
 
        return ret;
 }