]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: mvpp2: fix memory leak in mvpp2_rx
authorLorenzo Bianconi <lorenzo@kernel.org>
Fri, 31 Jul 2020 08:38:32 +0000 (10:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:26:54 +0000 (08:26 +0200)
[ Upstream commit d6526926de7397a97308780911565e31a6b67b59 ]

Release skb memory in mvpp2_rx() if mvpp2_rx_refill routine fails

Fixes: b5015854674b ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

index 24f4d8e0da989daaca10333ec9c5a3a22ec66c48..ee72397813d41fe4450ad14c205e3469b2154754 100644 (file)
@@ -2981,6 +2981,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi,
                err = mvpp2_rx_refill(port, bm_pool, pool);
                if (err) {
                        netdev_err(port->dev, "failed to refill BM pools\n");
+                       dev_kfree_skb_any(skb);
                        goto err_drop_frame;
                }