eth: mlx4: Fix IS_ERR() vs NULL check bug in mlx4_en_create_rx_ring
Subsystems (5)
PATCH v2 1/1 eth: mlx4: Fix IS_ERR() vs NULL check bug in mlx4_en_create_rx_ring
Replace NULL check with IS_ERR() check after calling page_pool_create() since this function returns error pointers (ERR_PTR).
Using NULL check could lead to invalid pointer dereference.
----
Changes in v2:
use err = PTR_ERR(ring->pp);
v1 link: https://lore.kernel.org/all/[email protected]
--- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_rx.c +3 -1
@@ -267,8 +267,10 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, pp.dma_dir = priv->dma_dir; ring->pp =page_pool_create (&pp); -if (!ring->pp) +if (!ring->pp) { + err =PTR_ERR (ring->pp); goto err_ring; + }if (xdp_rxq_info_reg (&ring->xdp_rxq, priv->dev, queue_index,0 ) <0 ) goto err_pp;
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 19 lines · Miaoqian Lin
Replace NULL check with
IS_ERR()check after callingpage_pool_create()since this function returns error pointers (ERR_PTR).
Using NULL check could lead to invalid pointer dereference.Fixes 8533b14b3d65 ("eth: mlx4: create a page pool for Rx")Signed-off-by Miaoqian Lin <[email protected]>----
Changes in v2:
use err =PTR_ERR(ring->pp);
v1 link: https://lore.kernel.org/all/[email protected]--- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx4/en_rx.c +0
-0
drivers/net/ethernet/mellanox/mlx4/en_rx.c int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, · line 273
Quoted 8 lines
drivers/net/ethernet/mellanox/mlx4/en_rx.c +3
-1@@ -267,8 +267,10 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, pp.dma_dir = priv->dma_dir; ring->pp =page_pool_create (&pp); -if (!ring->pp) +if (!ring->pp) { + err =PTR_ERR (ring->pp); goto err_ring; + }
I don't see IS_ERR() check in this version, without it the code makes no sense.