[PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak

[PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak

[Rafał Miłecki]

From: Rafał Miłecki <rafal@milecki.pl>

After filling RX ring slot with new skb it's required to free old skb.
Immediately on error or later in the net subsystem.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 drivers/net/ethernet/broadcom/bcm4908_enet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 9be33dc98072..7983c7a9fca9 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -570,6 +570,7 @@ static int bcm4908_enet_poll(struct napi_struct *napi, int weight)
 
 		if (len < ETH_ZLEN ||
 		    (ctl & (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) != (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) {
+			kfree_skb(slot.skb);
 			enet->netdev->stats.rx_dropped++;
 			break;
 		}
-- 
2.26.2

[PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value

[Rafał Miłecki]

From: Rafał Miłecki <rafal@milecki.pl>

Missing increment was resulting in poll function always returning 0
instead of amount of processed packets.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 7983c7a9fca9..0b70e9e0ddad 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -583,6 +583,8 @@ static int bcm4908_enet_poll(struct napi_struct *napi, int weight)
 
 		enet->netdev->stats.rx_packets++;
 		enet->netdev->stats.rx_bytes += len;
+
+		handled++;
 	}
 
 	if (handled < weight) {
-- 
2.26.2

Re: [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value

[Florian Fainelli]

On 2/24/2021 7:18 AM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Missing increment was resulting in poll function always returning 0
> instead of amount of processed packets.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller
driver")
-- 
Florian

Re: [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value

[Jakub Kicinski]

On Wed, 24 Feb 2021 09:06:18 -0800 Florian Fainelli wrote:
> On 2/24/2021 7:18 AM, Rafał Miłecki wrote:
> > From: Rafał Miłecki <rafal@milecki.pl>
> > 
> > Missing increment was resulting in poll function always returning 0
> > instead of amount of processed packets.
> > 
> > Signed-off-by: Rafał Miłecki <rafal@milecki.pl>  
> 
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller
> driver")

Applied, thank you!

Re: [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak

[Florian Fainelli]

On 2/24/2021 7:18 AM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> After filling RX ring slot with new skb it's required to free old skb.
> Immediately on error or later in the net subsystem.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller
driver")
-- 
Florian