| Message ID | 1508433452-23812-1-git-send-email-nikolay@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: bridge: fix returning of vlan range op errors | expand |
On Thu, Oct 19, 2017 at 10:17 AM, Nikolay Aleksandrov <nikolay@cumulusnetworks.com> wrote: > When vlan tunnels were introduced, vlan range errors got silently > dropped and instead 0 was returned always. Restore the previous > behaviour and return errors to user-space. > > Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support") > Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> > --- Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> thanks
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Date: Thu, 19 Oct 2017 20:17:32 +0300 > When vlan tunnels were introduced, vlan range errors got silently > dropped and instead 0 was returned always. Restore the previous > behaviour and return errors to user-space. > > Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support") > Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Applied and queued up for -stable.
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 3bc890716c89..de2152730809 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -573,7 +573,7 @@ static int br_process_vlan_info(struct net_bridge *br, } *vinfo_last = NULL; - return 0; + return err; } return br_vlan_info(br, p, cmd, vinfo_curr);
When vlan tunnels were introduced, vlan range errors got silently dropped and instead 0 was returned always. Restore the previous behaviour and return errors to user-space. Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support") Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> --- err should be always set because we have a check for the vid range above the loop and it must ensure we will go through the loop at least once net/bridge/br_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)