From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

Date: Mon, 20 Dec 2021 22:03:44 +0800

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

Patch-mainline: v5.16-rc7

Git-commit: 9b8bdd1eb5890aeeab7391dddcf8bd51f7b07216

References: git-fixes

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: 5a6681e22c14 ("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>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/sfc/falcon/rx.c |    5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

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

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

@@ -726,7 +726,10 @@ static void ef4_init_rx_recycle_ring(str

 					    efx->rx_bufs_per_page);

 	rx_queue->page_ring = kcalloc(page_ring_size,

 				      sizeof(*rx_queue->page_ring), GFP_KERNEL);

-	rx_queue->page_ptr_mask = page_ring_size - 1;

+	if (!rx_queue->page_ring)

+		rx_queue->page_ptr_mask = 0;

+	else

+		rx_queue->page_ptr_mask = page_ring_size - 1;

 }

 void ef4_init_rx_queue(struct ef4_rx_queue *rx_queue)