Commit 75871a52 authored by Tianyu Xu's avatar Tianyu Xu Committed by Tony Nguyen
Browse files

igb: Fix NULL pointer dereference in ethtool loopback test 



The igb driver currently causes a NULL pointer dereference when executing
the ethtool loopback test. This occurs because there is no associated
q_vector for the test ring when it is set up, as interrupts are typically
not added to the test rings.

Since commit 5ef44b3c removed the napi_id assignment in
__xdp_rxq_info_reg(), there is no longer a need to pass a napi_id to it.
Therefore, simply use 0 as the last parameter.

Fixes: 2c619601 ("igb: Add AF_XDP zero-copy Rx support")
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: default avatarJoe Damato <joe@dama.to>
Signed-off-by: default avatarTianyu Xu <tianyxu@cisco.com>
Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e3c674db

drivers/net/ethernet/intel/igb/igb_main.c

+1 −2
Original line number Diff line number Diff line
@@ -4453,8 +4453,7 @@ int igb_setup_rx_resources(struct igb_ring *rx_ring) 
	if (xdp_rxq_info_is_reg(&rx_ring->xdp_rxq))

		xdp_rxq_info_unreg(&rx_ring->xdp_rxq);

	res = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev,

			       rx_ring->queue_index,

			       rx_ring->q_vector->napi.napi_id);

			       rx_ring->queue_index, 0);

	if (res < 0) {

		dev_err(dev, "Failed to register xdp_rxq index %u\n",

			rx_ring->queue_index);