]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: bridge: vlan: check for errors from __vlan_del in __vlan_flush
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 14 Feb 2022 23:36:46 +0000 (01:36 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Feb 2022 14:37:28 +0000 (14:37 +0000)
commit5454f5c28eca6baba032f22e0df7df1c5e3f075f
tree0cd5f1e6ed81f88dedacfdbacb3be6fca37ce082
parent25ce79db8042d364fe957d51e734f14d5b0c933a
net: bridge: vlan: check for errors from __vlan_del in __vlan_flush

If the following call path returns an error from switchdev:

nbp_vlan_flush
-> __vlan_del
   -> __vlan_vid_del
      -> br_switchdev_port_vlan_del
-> __vlan_group_free
   -> WARN_ON(!list_empty(&vg->vlan_list));

then the deletion of the net_bridge_vlan is silently halted, which will
trigger the WARN_ON from __vlan_group_free().

The WARN_ON is rather unhelpful, because nothing about the source of the
error is printed. Add a print to catch errors from __vlan_del.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_vlan.c