Commit 0db4a47c authored Oct 04, 2018 by Colin Ian King Committed by Jeff Kirsher Nov 07, 2018

ixgbe: don't clear_bit on xdp_ring->state if xdp_ring is null

There is an earlier check to see if xdp_ring is null when configuring
the tx ring, so assuming that it can still be null, the clearing of
the xdp_ring->state currently could end up with a null pointer
dereference. Fix this by only clearing the bit if xdp_ring is not null.

Detected by CoverityScan, CID#1473795 ("Dereference after null check")

Fixes: 024aa580 ("ixgbe: added Rx/Tx ring disable/enable functions")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent b8607720

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -10517,6 +10517,7 @@ void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring)
		ixgbe_configure_rx_ring(adapter, rx_ring);

		clear_bit(__IXGBE_TX_DISABLED, &tx_ring->state);
		if (xdp_ring)
		clear_bit(__IXGBE_TX_DISABLED, &xdp_ring->state);
		}

Admin message