2024. 12. 11. 15:28 keltezéssel, Robert Hodaszi írta:
> Commit dcfe7673787b4bfea2c213df443d312aa754757b ("net: dsa: tag_sja1105:
> absorb logic for not overwriting precise info into dsa_8021q_rcv()")
> added support to let the DSA switch driver set source_port and
> switch_id. tag_8021q's logic overrides the previously set source_port
> and switch_id only if they are marked as "invalid" (-1). sja1105 and
> vsc73xx drivers are doing that properly, but ocelot_8021q driver doesn't
> initialize those variables. That causes dsa_8021q_rcv() doesn't set
> them, and they remain unassigned.
>
> Initialize them as invalid to so dsa_8021q_rcv() can return with the
> proper values.
>
> Fixes: dcfe7673787b ("net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv()")
> Signed-off-by: Robert Hodaszi <robert.hodaszi@xxxxxxxx>
> ---
> Cc: stable@xxxxxxxxxxxxxxx
> ---
> net/dsa/tag_ocelot_8021q.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c
> index 8e8b1bef6af6..11ea8cfd6266 100644
> --- a/net/dsa/tag_ocelot_8021q.c
> +++ b/net/dsa/tag_ocelot_8021q.c
> @@ -79,7 +79,7 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
> static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
> struct net_device *netdev)
> {
> - int src_port, switch_id;
> + int src_port = -1, switch_id = -1;
>
> dsa_8021q_rcv(skb, &src_port, &switch_id, NULL, NULL);
>
Ahh, sorry, for spamming the stable list! This supposed to be a test mail only, but accidentally left the CC there... :( I'm just sending out the real one.
Robert
