Commit e12dcd4a authored Dec 20, 2021 by Jiasheng Jiang Committed by Greg Kroah-Hartman Dec 29, 2021

sfc: falcon: Check null pointer of rx_queue->page_ring



[ Upstream commit 9b8bdd1eb5890aeeab7391dddcf8bd51f7b07216 ]

Because of the possible failure of the kcalloc, it should be better to
set rx_queue->page_ptr_mask to 0 when it happens in order to maintain
the consistency.

Fixes: 5a6681e2 ("sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
Link: https://lore.kernel.org/r/20211220140344.978408-1-jiasheng@iscas.ac.cn


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent c11a41e2

drivers/net/ethernet/sfc/falcon/rx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -726,6 +726,9 @@ static void ef4_init_rx_recycle_ring(struct ef4_nic *efx,
		efx->rx_bufs_per_page);
		rx_queue->page_ring = kcalloc(page_ring_size,
		sizeof(*rx_queue->page_ring), GFP_KERNEL);
		if (!rx_queue->page_ring)
		rx_queue->page_ptr_mask = 0;
		else
		rx_queue->page_ptr_mask = page_ring_size - 1;
		}