* [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps()
@ 2022-02-07 8:22 Dan Carpenter
2022-02-07 8:24 ` [PATCH 2/2 net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join() Dan Carpenter
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dan Carpenter @ 2022-02-07 8:22 UTC (permalink / raw)
To: Andrew Lunn, Russell King
Cc: Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S. Miller, Jakub Kicinski, Marek Behún, netdev,
kernel-janitors
The <= ARRAY_SIZE() needs to be < ARRAY_SIZE() to prevent an out of
bounds error.
Fixes: d4ebf12bcec4 ("net: dsa: mv88e6xxx: populate supported_interfaces and mac_capabilities")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 7670796c2aa1..192a7688b4df 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -585,7 +585,7 @@ static void mv88e6185_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,
{
u8 cmode = chip->ports[port].cmode;
- if (cmode <= ARRAY_SIZE(mv88e6185_phy_interface_modes) &&
+ if (cmode < ARRAY_SIZE(mv88e6185_phy_interface_modes) &&
mv88e6185_phy_interface_modes[cmode])
__set_bit(mv88e6185_phy_interface_modes[cmode],
config->supported_interfaces);
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2 net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join()
2022-02-07 8:22 [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Dan Carpenter
@ 2022-02-07 8:24 ` Dan Carpenter
2022-02-07 10:10 ` [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Russell King (Oracle)
2022-02-07 12:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2022-02-07 8:24 UTC (permalink / raw)
To: Andrew Lunn, Tobias Waldekranz
Cc: Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S. Miller, Jakub Kicinski, netdev, kernel-janitors,
Russell King
Call mv88e6xxx_reg_unlock(chip) before returning on this error path.
Fixes: 7af4a361a62f ("net: dsa: mv88e6xxx: Improve isolation of standalone ports")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 192a7688b4df..c54649c4c3a0 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2602,7 +2602,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
err = mv88e6xxx_port_set_map_da(chip, port, true);
if (err)
- return err;
+ goto unlock;
err = mv88e6xxx_port_commit_pvid(chip, port);
if (err)
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps()
2022-02-07 8:22 [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Dan Carpenter
2022-02-07 8:24 ` [PATCH 2/2 net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join() Dan Carpenter
@ 2022-02-07 10:10 ` Russell King (Oracle)
2022-02-07 12:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Russell King (Oracle) @ 2022-02-07 10:10 UTC (permalink / raw)
To: Dan Carpenter
Cc: Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S. Miller, Jakub Kicinski, Marek Behún, netdev,
kernel-janitors
On Mon, Feb 07, 2022 at 11:22:53AM +0300, Dan Carpenter wrote:
> The <= ARRAY_SIZE() needs to be < ARRAY_SIZE() to prevent an out of
> bounds error.
>
> Fixes: d4ebf12bcec4 ("net: dsa: mv88e6xxx: populate supported_interfaces and mac_capabilities")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Good catch, thanks.
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps()
2022-02-07 8:22 [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Dan Carpenter
2022-02-07 8:24 ` [PATCH 2/2 net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join() Dan Carpenter
2022-02-07 10:10 ` [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Russell King (Oracle)
@ 2022-02-07 12:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-02-07 12:40 UTC (permalink / raw)
To: Dan Carpenter
Cc: andrew, rmk+kernel, vivien.didelot, f.fainelli, olteanv, davem,
kuba, kabel, netdev, kernel-janitors
Hello:
This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Mon, 7 Feb 2022 11:22:53 +0300 you wrote:
> The <= ARRAY_SIZE() needs to be < ARRAY_SIZE() to prevent an out of
> bounds error.
>
> Fixes: d4ebf12bcec4 ("net: dsa: mv88e6xxx: populate supported_interfaces and mac_capabilities")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Here is the summary with links:
- [1/2,net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps()
https://git.kernel.org/netdev/net-next/c/dde41a697331
- [2/2,net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join()
https://git.kernel.org/netdev/net-next/c/ff62433883b3
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:[~2022-02-07 13:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-07 8:22 [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Dan Carpenter
2022-02-07 8:24 ` [PATCH 2/2 net-next] net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join() Dan Carpenter
2022-02-07 10:10 ` [PATCH 1/2 net-next] net: dsa: mv88e6xxx: Fix off by in one in mv88e6185_phylink_get_caps() Russell King (Oracle)
2022-02-07 12:40 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.