diff options
| author | Edward Cree <ecree@solarflare.com> | 2014-02-25 13:17:59 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:10 -0700 |
| commit | 43800d3eeded6b9016fd16b18cbc62154a3ec31e (patch) | |
| tree | 2c624bdfd45a173a0117e2c249c80ba19670b9da /drivers/net | |
| parent | 150d6bdb9d2c1bbdf95ba9502c35b5f4ddc4bd7e (diff) | |
| download | lwn-43800d3eeded6b9016fd16b18cbc62154a3ec31e.tar.gz lwn-43800d3eeded6b9016fd16b18cbc62154a3ec31e.zip | |
sfc: check for NULL efx->ptp_data in efx_ptp_event
[ Upstream commit 8f355e5cee63c2c0c145d8206c4245d0189f47ff ]
If we receive a PTP event from the NIC when we haven't set up PTP state
in the driver, we attempt to read through a NULL pointer efx->ptp_data,
triggering a panic.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Acked-by: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 9a95abf2dedf..540ad16d7807 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1319,6 +1319,13 @@ void efx_ptp_event(struct efx_nic *efx, efx_qword_t *ev) struct efx_ptp_data *ptp = efx->ptp_data; int code = EFX_QWORD_FIELD(*ev, MCDI_EVENT_CODE); + if (!ptp) { + if (net_ratelimit()) + netif_warn(efx, drv, efx->net_dev, + "Received PTP event but PTP not set up\n"); + return; + } + if (!ptp->enabled) return; |