Skip to content

Commit 996422e

Browse files
jacob-kellerkuba-moo
authored andcommitted
ice: Don't process extts if PTP is disabled
The ice_ptp_extts_event() function can race with ice_ptp_release() and result in a NULL pointer dereference which leads to a kernel panic. Panic occurs because the ice_ptp_extts_event() function calls ptp_clock_event() with a NULL pointer. The ice driver has already released the PTP clock by the time the interrupt for the next external timestamp event occurs. To fix this, modify the ice_ptp_extts_event() function to check the PTP state and bail early if PTP is not ready. Fixes: 172db5f ("ice: add support for auxiliary input/output pins") Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Link: https://patch.msgid.link/20240702171459.2606611-3-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 00d3b4f commit 996422e

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/net/ethernet/intel/ice/ice_ptp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,10 @@ void ice_ptp_extts_event(struct ice_pf *pf)
15591559
u8 chan, tmr_idx;
15601560
u32 hi, lo;
15611561

1562+
/* Don't process timestamp events if PTP is not ready */
1563+
if (pf->ptp.state != ICE_PTP_READY)
1564+
return;
1565+
15621566
tmr_idx = hw->func_caps.ts_func_info.tmr_index_owned;
15631567
/* Event time is captured by one of the two matched registers
15641568
* GLTSYN_EVNT_L: 32 LSB of sampled time event

0 commit comments

Comments
 (0)