Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d88d59fa authored by Przemyslaw Patynowski's avatar Przemyslaw Patynowski Committed by Greg Kroah-Hartman
Browse files

iavf: Fix handling of dummy receive descriptors 



[ Upstream commit a9f49e0060301a9bfebeca76739158d0cf91cdf6 ]

Fix memory leak caused by not handling dummy receive descriptor properly.
iavf_get_rx_buffer now sets the rx_buffer return value for dummy receive
descriptors. Without this patch, when the hardware writes a dummy
descriptor, iavf would not free the page allocated for the previous receive
buffer. This is an unlikely event but can still happen.

[Jesse: massaged commit message]

Fixes: efa14c39 ("iavf: allow null RX descriptors")
Signed-off-by: default avatarPrzemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 25d53d85

drivers/net/ethernet/intel/iavf/iavf_txrx.c

+2 −3
Original line number Diff line number Diff line
@@ -1263,11 +1263,10 @@ static struct iavf_rx_buffer *iavf_get_rx_buffer(struct iavf_ring *rx_ring, 
{

	struct iavf_rx_buffer *rx_buffer;



	if (!size)

		return NULL;



	rx_buffer = &rx_ring->rx_bi[rx_ring->next_to_clean];

	prefetchw(rx_buffer->page);

	if (!size)

		return rx_buffer;



	/* we are reusing so sync this buffer for CPU use */

	dma_sync_single_range_for_cpu(rx_ring->dev,