nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: dsa: b53: fix an off by one in checking "vlan->vid"

Browse source 
The > comparison should be >= to prevent accessing one element beyond
the end of the dev->vlans[] array in the caller function, b53_vlan_add().
The "dev->vlans" array is allocated in the b53_switch_init() function
and it has "dev->num_vlans" elements.

Fixes: a2482d2ce3 ("net: dsa: b53: Plug in VLAN support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/YAbxI97Dl/pmBy5V@mwanda
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Dan Carpenter 2021-01-19 17:48:03 +03:00 committed by Jakub Kicinski
parent b160c28548
commit 8e4052c32d
1 changed files with 1 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/dsa/b53/b53_common.c
View file

@ -1404,7 +1404,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port,
!(vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED)) !(vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED))
return -EINVAL; return -EINVAL;
if (vlan->vid_end > dev->num_vlans) if (vlan->vid_end >= dev->num_vlans)
return -ERANGE; return -ERANGE;
b53_enable_vlan(dev, true, ds->vlan_filtering); b53_enable_vlan(dev, true, ds->vlan_filtering);