Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 867462fd authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman
Browse files

net: dsa: rtl8366rb: Fix off-by-one bug 



[ Upstream commit 5f5f12f5d4b108399130bb5c11f07765851d9cdb ]

The max VLAN number with non-4K VLAN activated is 15, and the
range is 0..15. Not 16.

The impact should be low since we by default have 4K VLAN and
thus have 4095 VLANs to play with in this switch. There will
not be a problem unless the code is rewritten to only use
16 VLANs.

Fixes: d8652956 ("net: dsa: realtek-smi: Add Realtek SMI driver")
Cc: Mauri Sandberg <sandberg@mailfence.com>
Cc: DENG Qingfang <dqfext@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7b170c73

drivers/net/dsa/rtl8366rb.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int rtl8366rb_set_mc_index(struct realtek_smi *smi, int port, int index) 


static bool rtl8366rb_is_vlan_valid(struct realtek_smi *smi, unsigned int vlan)

{

	unsigned int max = RTL8366RB_NUM_VLANS;

	unsigned int max = RTL8366RB_NUM_VLANS - 1;



	if (smi->vlan4k_enabled)

		max = RTL8366RB_NUM_VIDS - 1;