* [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak
@ 2021-02-24 15:18 Rafał Miłecki
2021-02-24 15:18 ` [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value Rafał Miłecki
2021-02-24 17:05 ` [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Florian Fainelli
0 siblings, 2 replies; 5+ messages in thread
From: Rafał Miłecki @ 2021-02-24 15:18 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: netdev, Florian Fainelli, bcm-kernel-feedback-list,
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value
2021-02-24 15:18 [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Rafał Miłecki
@ 2021-02-24 15:18 ` Rafał Miłecki
2021-02-24 17:06 ` Florian Fainelli
2021-02-24 17:05 ` [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Florian Fainelli
1 sibling, 1 reply; 5+ messages in thread
From: Rafał Miłecki @ 2021-02-24 15:18 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: netdev, Florian Fainelli, bcm-kernel-feedback-list,
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value
2021-02-24 15:18 ` [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value Rafał Miłecki
@ 2021-02-24 17:06 ` Florian Fainelli
2021-02-25 17:48 ` Jakub Kicinski
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2021-02-24 17:06 UTC (permalink / raw)
To: Rafał Miłecki, David S . Miller, Jakub Kicinski
Cc: netdev, bcm-kernel-feedback-list, Rafał Miłecki
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value
2021-02-24 17:06 ` Florian Fainelli
@ 2021-02-25 17:48 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2021-02-25 17:48 UTC (permalink / raw)
To: Florian Fainelli
Cc: Rafał Miłecki, David S . Miller, netdev,
bcm-kernel-feedback-list, Rafał Miłecki
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!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak
2021-02-24 15:18 [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Rafał Miłecki
2021-02-24 15:18 ` [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value Rafał Miłecki
@ 2021-02-24 17:05 ` Florian Fainelli
1 sibling, 0 replies; 5+ messages in thread
From: Florian Fainelli @ 2021-02-24 17:05 UTC (permalink / raw)
To: Rafał Miłecki, David S . Miller, Jakub Kicinski
Cc: netdev, bcm-kernel-feedback-list, Rafał Miłecki
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-25 17:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-24 15:18 [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Rafał Miłecki
2021-02-24 15:18 ` [PATCH net] net: broadcom: bcm4908_enet: fix NAPI poll returned value Rafał Miłecki
2021-02-24 17:06 ` Florian Fainelli
2021-02-25 17:48 ` Jakub Kicinski
2021-02-24 17:05 ` [PATCH net] net: broadcom: bcm4908_enet: fix RX path possible mem leak Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).