This is a note to let you know that I've just added the patch titled
net: mvpp2: fix memory leak in mvpp2_rx
to the 5.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mvpp2-fix-memory-leak-in-mvpp2_rx.patch
and it can be found in the queue-5.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Mon 10 Aug 2020 02:00:10 PM CEST
From: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
Date: Fri, 31 Jul 2020 10:38:32 +0200
Subject: net: mvpp2: fix memory leak in mvpp2_rx
From: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
[ 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@xxxxxxxxxx>
Acked-by: Matteo Croce <mcroce@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -2981,6 +2981,7 @@ static int mvpp2_rx(struct mvpp2_port *p
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;
}
Patches currently in stable-queue which might be from lorenzo@xxxxxxxxxx are
queue-5.7/net-mvpp2-fix-memory-leak-in-mvpp2_rx.patch
queue-5.7/net-gre-recompute-gre-csum-for-sctp-over-gre-tunnels.patch
