* [PATCH net v4] net: b44: set pause params only when interface is up
@ 2024-04-24 13:51 Peter Münster
2024-04-24 16:37 ` Michael Chan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Peter Münster @ 2024-04-24 13:51 UTC (permalink / raw)
To: netdev; +Cc: Michael Chan
[-- Attachment #1: Type: text/plain, Size: 1753 bytes --]
b44_free_rings() accesses b44::rx_buffers (and ::tx_buffers)
unconditionally, but b44::rx_buffers is only valid when the
device is up (they get allocated in b44_open(), and deallocated
again in b44_close()), any other time these are just a NULL pointers.
So if you try to change the pause params while the network interface
is disabled/administratively down, everything explodes (which likely
netifd tries to do).
Link: https://github.com/openwrt/openwrt/issues/13789
Fixes: 1da177e4c3f4 (Linux-2.6.12-rc2)
Cc: stable@vger.kernel.org
Reported-by: Peter Münster <pm@a16n.net>
Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: Vaclav Svoboda <svoboda@neng.cz>
Tested-by: Peter Münster <pm@a16n.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Peter Münster <pm@a16n.net>
---
drivers/net/ethernet/broadcom/b44.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 3e4fb3c3e834..1be6d14030bc 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2009,12 +2009,14 @@ static int b44_set_pauseparam(struct net_device *dev,
bp->flags |= B44_FLAG_TX_PAUSE;
else
bp->flags &= ~B44_FLAG_TX_PAUSE;
- if (bp->flags & B44_FLAG_PAUSE_AUTO) {
- b44_halt(bp);
- b44_init_rings(bp);
- b44_init_hw(bp, B44_FULL_RESET);
- } else {
- __b44_set_flow_ctrl(bp, bp->flags);
+ if (netif_running(dev)) {
+ if (bp->flags & B44_FLAG_PAUSE_AUTO) {
+ b44_halt(bp);
+ b44_init_rings(bp);
+ b44_init_hw(bp, B44_FULL_RESET);
+ } else {
+ __b44_set_flow_ctrl(bp, bp->flags);
+ }
}
spin_unlock_irq(&bp->lock);
--
2.35.3
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v4] net: b44: set pause params only when interface is up
2024-04-24 13:51 [PATCH net v4] net: b44: set pause params only when interface is up Peter Münster
@ 2024-04-24 16:37 ` Michael Chan
2024-04-25 5:20 ` Hariprasad Kelam
2024-04-25 15:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Michael Chan @ 2024-04-24 16:37 UTC (permalink / raw)
To: Peter Münster; +Cc: netdev
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
On Wed, Apr 24, 2024 at 6:51 AM Peter Münster <pm@a16n.net> wrote:
>
> b44_free_rings() accesses b44::rx_buffers (and ::tx_buffers)
> unconditionally, but b44::rx_buffers is only valid when the
> device is up (they get allocated in b44_open(), and deallocated
> again in b44_close()), any other time these are just a NULL pointers.
>
> So if you try to change the pause params while the network interface
> is disabled/administratively down, everything explodes (which likely
> netifd tries to do).
>
> Link: https://github.com/openwrt/openwrt/issues/13789
> Fixes: 1da177e4c3f4 (Linux-2.6.12-rc2)
> Cc: stable@vger.kernel.org
> Reported-by: Peter Münster <pm@a16n.net>
> Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
> Signed-off-by: Vaclav Svoboda <svoboda@neng.cz>
> Tested-by: Peter Münster <pm@a16n.net>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Peter Münster <pm@a16n.net>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net v4] net: b44: set pause params only when interface is up
2024-04-24 13:51 [PATCH net v4] net: b44: set pause params only when interface is up Peter Münster
2024-04-24 16:37 ` Michael Chan
@ 2024-04-25 5:20 ` Hariprasad Kelam
2024-04-25 15:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Hariprasad Kelam @ 2024-04-25 5:20 UTC (permalink / raw)
To: Peter Münster, netdev@vger.kernel.org; +Cc: Michael Chan
Understood, this patch fixes the panic issue.
See inline for few comments,
> b44_free_rings() accesses b44::rx_buffers (and ::tx_buffers) unconditionally,
> but b44::rx_buffers is only valid when the device is up (they get allocated in
> b44_open(), and deallocated again in b44_close()), any other time these are
> just a NULL pointers.
>
> So if you try to change the pause params while the network interface is
> disabled/administratively down, everything explodes (which likely netifd tries
> to do).
>
> Link: https://github.com/openwrt/openwrt/issues/13789
> Fixes: 1da177e4c3f4 (Linux-2.6.12-rc2)
> Cc: stable@vger.kernel.org
> Reported-by: Peter Münster <pm@a16n.net>
> Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
> Signed-off-by: Vaclav Svoboda <svoboda@neng.cz>
> Tested-by: Peter Münster <pm@a16n.net>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Peter Münster <pm@a16n.net>
> ---
> drivers/net/ethernet/broadcom/b44.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/b44.c
> b/drivers/net/ethernet/broadcom/b44.c
> index 3e4fb3c3e834..1be6d14030bc 100644
> --- a/drivers/net/ethernet/broadcom/b44.c
> +++ b/drivers/net/ethernet/broadcom/b44.c
> @@ -2009,12 +2009,14 @@ static int b44_set_pauseparam(struct net_device
> *dev,
> bp->flags |= B44_FLAG_TX_PAUSE;
> else
> bp->flags &= ~B44_FLAG_TX_PAUSE;
> - if (bp->flags & B44_FLAG_PAUSE_AUTO) {
> - b44_halt(bp);
> - b44_init_rings(bp);
> - b44_init_hw(bp, B44_FULL_RESET);
> - } else {
> - __b44_set_flow_ctrl(bp, bp->flags);
> + if (netif_running(dev)) {
> + if (bp->flags & B44_FLAG_PAUSE_AUTO) {
> + b44_halt(bp);
> + b44_init_rings(bp);
> + b44_init_hw(bp, B44_FULL_RESET);
> + } else {
> + __b44_set_flow_ctrl(bp, bp->flags);
> + }
> }
The actual register config to enable pause frame is protected with "netif_running", does driver need to
reject the request if interface is down.
Otherwise, there is mismatch if someone reads pause frame status (b44_get_pauseparam).
Thanks,
Hariprasad k
> spin_unlock_irq(&bp->lock);
>
> --
> 2.35.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v4] net: b44: set pause params only when interface is up
2024-04-24 13:51 [PATCH net v4] net: b44: set pause params only when interface is up Peter Münster
2024-04-24 16:37 ` Michael Chan
2024-04-25 5:20 ` Hariprasad Kelam
@ 2024-04-25 15:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-04-25 15:40 UTC (permalink / raw)
To: =?utf-8?q?Peter_M=C3=BCnster_=3Cpm=40a16n=2Enet=3E?=; +Cc: netdev, michael.chan
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 24 Apr 2024 15:51:52 +0200 you wrote:
> b44_free_rings() accesses b44::rx_buffers (and ::tx_buffers)
> unconditionally, but b44::rx_buffers is only valid when the
> device is up (they get allocated in b44_open(), and deallocated
> again in b44_close()), any other time these are just a NULL pointers.
>
> So if you try to change the pause params while the network interface
> is disabled/administratively down, everything explodes (which likely
> netifd tries to do).
>
> [...]
Here is the summary with links:
- [net,v4] net: b44: set pause params only when interface is up
https://git.kernel.org/netdev/net/c/e3eb7dd47bd4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-25 15:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-24 13:51 [PATCH net v4] net: b44: set pause params only when interface is up Peter Münster
2024-04-24 16:37 ` Michael Chan
2024-04-25 5:20 ` Hariprasad Kelam
2024-04-25 15:40 ` patchwork-bot+netdevbpf
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).