net: dsa: rtl8366: Check validity of passed VLANs

[ Upstream commit 6641a2c42b0a307b7638d10e5d4b90debc61389d ]

The rtl8366_set_vlan() and rtl8366_set_pvid() get invalid
VLANs tossed at it, especially VLAN0, something the hardware
and driver cannot handle. Check validity and bail out like
we do in the other callbacks.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c
index 99cdb2f18fa2f23a8445a2dadaa4396b15e04f86..a62d76a048dfa2b43306e3170ffa135a6aaa1a42 100644 (file)
--- a/drivers/net/dsa/rtl8366.c
+++ b/drivers/net/dsa/rtl8366.c
@@ -43,6 +43,9 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,
        int ret;
        int i;
 
+       if (!smi->ops->is_vlan_valid(smi, vid))
+               return -EINVAL;
+
        dev_dbg(smi->dev,
                "setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",
                vid, member, untag);
@@ -118,6 +121,9 @@ int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,
        int ret;
        int i;
 
+       if (!smi->ops->is_vlan_valid(smi, vid))
+               return -EINVAL;
+
        /* Try to find an existing MC entry for this VID */
        for (i = 0; i < smi->num_vlan_mc; i++) {
                ret = smi->ops->get_vlan_mc(smi, i, &vlanmc);