net: mvpp2: fix memory leak in mvpp2_rx

LorenzoBianconi · davem330 · commit d6526926de73 · 2020-08-03T15:14:46.000-07:00
Release skb memory in mvpp2_rx() if mvpp2_rx_refill routine fails Fixes: b501585 ("net: mvpp2: fix refilling BM pools in RX path") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Acked-by: Matteo Croce <mcroce@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -3508,6 +3508,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi,
 		err = mvpp2_rx_refill(port, bm_pool, pp, pool);
 		if (err) {
 			netdev_err(port->dev, "failed to refill BM pools\n");
+			dev_kfree_skb_any(skb);
 			goto err_drop_frame;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3508,6 +3508,7 @@ static int mvpp2_rx(struct mvpp2_port port, struct napi_struct napi,`
`3508`	`3508`	`err = mvpp2_rx_refill(port, bm_pool, pp, pool);`
`3509`	`3509`	`if (err) {`
`3510`	`3510`	`netdev_err(port->dev, "failed to refill BM pools\n");`
	`3511`	`+ dev_kfree_skb_any(skb);`
`3511`	`3512`	`goto err_drop_frame;`
`3512`	`3513`	`}`
`3513`	`3514`