* [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries()
@ 2023-10-06 11:58 Oleksij Rempel
2023-10-06 17:24 ` Florian Fainelli
2023-10-10 9:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Oleksij Rempel @ 2023-10-06 11:58 UTC (permalink / raw)
To: David S. Miller, Andrew Lunn, Eric Dumazet, Florian Fainelli,
Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Woojung Huh,
Arun Ramadoss, Russell King (Oracle)
Cc: Oleksij Rempel, Dan Carpenter, kernel, linux-kernel, netdev,
UNGLinuxDriver, Petr Machata, Lukasz Majewski
Address an issue in ksz9477_acl_move_entries() where, in the scenario
(src_idx == dst_idx), ksz9477_validate_and_get_src_count() returns 0,
leading to usage of uninitialized src_count and dst_count variables,
which causes undesired behavior as it attempts to move ACL entries
around.
Fixes: 002841be134e ("net: dsa: microchip: Add partial ACL support for ksz9477 switches")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Suggested-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz9477_acl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477_acl.c b/drivers/net/dsa/microchip/ksz9477_acl.c
index 06d74c19eb94..7ba778df63ac 100644
--- a/drivers/net/dsa/microchip/ksz9477_acl.c
+++ b/drivers/net/dsa/microchip/ksz9477_acl.c
@@ -420,10 +420,6 @@ static int ksz9477_validate_and_get_src_count(struct ksz_device *dev, int port,
return -EINVAL;
}
- /* Nothing to do */
- if (src_idx == dst_idx)
- return 0;
-
/* Validate if the source entries are contiguous */
ret = ksz9477_acl_get_cont_entr(dev, port, src_idx);
if (ret < 0)
@@ -556,6 +552,10 @@ static int ksz9477_acl_move_entries(struct ksz_device *dev, int port,
struct ksz9477_acl_entries *acles = &acl->acles;
int src_count, ret, dst_count;
+ /* Nothing to do */
+ if (src_idx == dst_idx)
+ return 0;
+
ret = ksz9477_validate_and_get_src_count(dev, port, src_idx, dst_idx,
&src_count, &dst_count);
if (ret)
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries()
2023-10-06 11:58 [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries() Oleksij Rempel
@ 2023-10-06 17:24 ` Florian Fainelli
2023-10-10 9:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2023-10-06 17:24 UTC (permalink / raw)
To: Oleksij Rempel, David S. Miller, Andrew Lunn, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Woojung Huh,
Arun Ramadoss, Russell King (Oracle)
Cc: Dan Carpenter, kernel, linux-kernel, netdev, UNGLinuxDriver,
Petr Machata, Lukasz Majewski
On 10/6/23 04:58, Oleksij Rempel wrote:
> Address an issue in ksz9477_acl_move_entries() where, in the scenario
> (src_idx == dst_idx), ksz9477_validate_and_get_src_count() returns 0,
> leading to usage of uninitialized src_count and dst_count variables,
> which causes undesired behavior as it attempts to move ACL entries
> around.
>
> Fixes: 002841be134e ("net: dsa: microchip: Add partial ACL support for ksz9477 switches")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Suggested-by: Vladimir Oltean <olteanv@gmail.com>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries()
2023-10-06 11:58 [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries() Oleksij Rempel
2023-10-06 17:24 ` Florian Fainelli
@ 2023-10-10 9:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-10 9:20 UTC (permalink / raw)
To: Oleksij Rempel
Cc: davem, andrew, edumazet, f.fainelli, kuba, pabeni, olteanv,
woojung.huh, arun.ramadoss, linux, dan.carpenter, kernel,
linux-kernel, netdev, UNGLinuxDriver, petrm, lukma
Hello:
This patch was applied to netdev/net-next.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Fri, 6 Oct 2023 13:58:22 +0200 you wrote:
> Address an issue in ksz9477_acl_move_entries() where, in the scenario
> (src_idx == dst_idx), ksz9477_validate_and_get_src_count() returns 0,
> leading to usage of uninitialized src_count and dst_count variables,
> which causes undesired behavior as it attempts to move ACL entries
> around.
>
> Fixes: 002841be134e ("net: dsa: microchip: Add partial ACL support for ksz9477 switches")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Suggested-by: Vladimir Oltean <olteanv@gmail.com>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
>
> [...]
Here is the summary with links:
- [net-next,v1,1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries()
https://git.kernel.org/netdev/net-next/c/59fe651753fb
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] 3+ messages in thread
end of thread, other threads:[~2023-10-10 9:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-06 11:58 [PATCH net-next v1 1/1] net: dsa: microchip: Fix uninitialized var in ksz9477_acl_move_entries() Oleksij Rempel
2023-10-06 17:24 ` Florian Fainelli
2023-10-10 9:20 ` 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).