mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
net: bridge: vlan: fix memory leak in __allowed_ingress
[ Upstream commitfd20d97383
] When using per-vlan state, if vlan snooping and stats are disabled, untagged or priority-tagged ingress frame will go to check pvid state. If the port state is forwarding and the pvid state is not learning/forwarding, untagged or priority-tagged frame will be dropped but skb memory is not freed. Should free skb when __allowed_ingress returns false. Fixes:a580c76d53
("net: bridge: vlan: add per-vlan state") Signed-off-by: Tim Yi <tim.yi@pica8.com> Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com> Link: https://lore.kernel.org/r/20220127074953.12632-1-tim.yi@pica8.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
bc58a5bb9e
commit
446ff1fc37
1 changed files with 3 additions and 3 deletions
|
@ -543,10 +543,10 @@ static bool __allowed_ingress(const struct net_bridge *br,
|
|||
if (!br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) {
|
||||
if (*state == BR_STATE_FORWARDING) {
|
||||
*state = br_vlan_get_pvid_state(vg);
|
||||
return br_vlan_state_allowed(*state, true);
|
||||
} else {
|
||||
return true;
|
||||
if (!br_vlan_state_allowed(*state, true))
|
||||
goto drop;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
v = br_vlan_find(vg, *vid);
|
||||
|
|
Loading…
Reference in a new issue