diff options
| author | Jiasheng Jiang <jiasheng@iscas.ac.cn> | 2021-12-20 22:03:44 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-29 12:23:35 +0100 |
| commit | e12dcd4aa7f41845ecc6c65a57dbfb1d6a3a65c4 (patch) | |
| tree | c0522a81811d5f4a3d83919ca6be35c33de81c22 /drivers/net | |
| parent | c11a41e26985eea38ea18df798a9cda8ade4b78e (diff) | |
| download | linux-e12dcd4aa7f41845ecc6c65a57dbfb1d6a3a65c4.tar.gz linux-e12dcd4aa7f41845ecc6c65a57dbfb1d6a3a65c4.tar.bz2 linux-e12dcd4aa7f41845ecc6c65a57dbfb1d6a3a65c4.zip | |
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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/sfc/falcon/rx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/falcon/rx.c b/drivers/net/ethernet/sfc/falcon/rx.c index 05ea3523890a..d516f81ab37a 100644 --- 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(struct ef4_nic *efx, 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) |