Skip to content

Commit 403bf04

Browse files
jacob-kelleranguy11
authored andcommitted
ice: fix NULL access of tx->in_use in ice_ptp_ts_irq
The E810 device has support for a "low latency" firmware interface to access and read the Tx timestamps. This interface does not use the standard Tx timestamp logic, due to the latency overhead of proxying sideband command requests over the firmware AdminQ. The logic still makes use of the Tx timestamp tracking structure, ice_ptp_tx, as it uses the same "ready" bitmap to track which Tx timestamps complete. Unfortunately, the ice_ptp_ts_irq() function does not check if the tracker is initialized before its first access. This results in NULL dereference or use-after-free bugs similar to the following: [245977.278756] BUG: kernel NULL pointer dereference, address: 0000000000000000 [245977.278774] RIP: 0010:_find_first_bit+0x19/0x40 [245977.278796] Call Trace: [245977.278809] ? ice_misc_intr+0x364/0x380 [ice] This can occur if a Tx timestamp interrupt races with the driver reset logic. Fix this by only checking the in_use bitmap (and other fields) if the tracker is marked as initialized. The reset flow will clear the init field under lock before it tears the tracker down, thus preventing any use-after-free or NULL access. Fixes: f9472aa ("ice: Process TSYN IRQ in a separate function") Signed-off-by: Jacob Keller <[email protected]> Reviewed-by: Paul Menzel <[email protected]> Reviewed-by: Aleksandr Loktionov <[email protected]> Tested-by: Rinitha S <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent a6099f2 commit 403bf04

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,16 +2701,19 @@ irqreturn_t ice_ptp_ts_irq(struct ice_pf *pf)
27012701
*/
27022702
if (hw->dev_caps.ts_dev_info.ts_ll_int_read) {
27032703
struct ice_ptp_tx *tx = &pf->ptp.port.tx;
2704-
u8 idx;
2704+
u8 idx, last;
27052705

27062706
if (!ice_pf_state_is_nominal(pf))
27072707
return IRQ_HANDLED;
27082708

27092709
spin_lock(&tx->lock);
2710-
idx = find_next_bit_wrap(tx->in_use, tx->len,
2711-
tx->last_ll_ts_idx_read + 1);
2712-
if (idx != tx->len)
2713-
ice_ptp_req_tx_single_tstamp(tx, idx);
2710+
if (tx->init) {
2711+
last = tx->last_ll_ts_idx_read + 1;
2712+
idx = find_next_bit_wrap(tx->in_use, tx->len,
2713+
last);
2714+
if (idx != tx->len)
2715+
ice_ptp_req_tx_single_tstamp(tx, idx);
2716+
}
27142717
spin_unlock(&tx->lock);
27152718

27162719
return IRQ_HANDLED;

0 commit comments

Comments
 (0)