Skip to content

Commit de66c61

Browse files
jacob-kellerJeff Kirsher
authored andcommitted
fm10k: prevent null pointer dereference of msix_entries table
According to the C standard dereferencing a variable before it is checked invokes undefined behavior, and thus compilers are free to assume the check for NULL isn't necessary. Prevent this by re-ordering the NULL check of msix_entries in fm10k_free_mbx_irq. Signed-off-by: Jacob Keller <[email protected]> Tested-by: Krishneil Singh <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 11c49f7 commit de66c61

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,14 +1143,16 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)
11431143

11441144
void fm10k_mbx_free_irq(struct fm10k_intfc *interface)
11451145
{
1146-
struct msix_entry *entry = &interface->msix_entries[FM10K_MBX_VECTOR];
11471146
struct fm10k_hw *hw = &interface->hw;
1147+
struct msix_entry *entry;
11481148
int itr_reg;
11491149

11501150
/* no mailbox IRQ to free if MSI-X is not enabled */
11511151
if (!interface->msix_entries)
11521152
return;
11531153

1154+
entry = &interface->msix_entries[FM10K_MBX_VECTOR];
1155+
11541156
/* disconnect the mailbox */
11551157
hw->mbx.ops.disconnect(hw, &hw->mbx);
11561158

0 commit comments

Comments
 (0)