aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-10-22 10:34:35 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-22 17:48:06 -0400
commit81f35ffde0e95ee18de83646bbf93dda55d9cc8b (patch)
tree418229836e8c17ee9085243e4797b8f61fdfad84
parent9e7ceb060754f134231f68cb29d5db31419fe1ed (diff)
net: fec: ptp: fix NULL pointer dereference if ptp_clock is not set
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>
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 81b96cf87574..50a851db2852 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1581,7 +1581,8 @@ fec_enet_interrupt(int irq, void *dev_id)
1581 complete(&fep->mdio_done); 1581 complete(&fep->mdio_done);
1582 } 1582 }
1583 1583
1584 fec_ptp_check_pps_event(fep); 1584 if (fep->ptp_clock)
1585 fec_ptp_check_pps_event(fep);
1585 1586
1586 return ret; 1587 return ret;
1587} 1588}