Commit 60743123 authored by David Ahern's avatar David Ahern Committed by Stefan Bader

net: mpls: Pull common label check into helper

BugLink: http://bugs.launchpad.net/bugs/1764367

commit b7b386f4 upstream.

mpls_route_add and mpls_route_del have the same checks on the label.
Move to a helper. Avoid duplicate extack messages in the next patch.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent ceb326c5
...@@ -716,6 +716,19 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg, ...@@ -716,6 +716,19 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg,
return err; return err;
} }
static bool mpls_label_ok(struct net *net, unsigned int index)
{
/* Reserved labels may not be set */
if (index < MPLS_LABEL_FIRST_UNRESERVED)
return false;
/* The full 20 bit range may not be supported. */
if (index >= net->mpls.platform_labels)
return false;
return true;
}
static int mpls_route_add(struct mpls_route_config *cfg) static int mpls_route_add(struct mpls_route_config *cfg)
{ {
struct mpls_route __rcu **platform_label; struct mpls_route __rcu **platform_label;
...@@ -734,12 +747,7 @@ static int mpls_route_add(struct mpls_route_config *cfg) ...@@ -734,12 +747,7 @@ static int mpls_route_add(struct mpls_route_config *cfg)
index = find_free_label(net); index = find_free_label(net);
} }
/* Reserved labels may not be set */ if (!mpls_label_ok(net, index))
if (index < MPLS_LABEL_FIRST_UNRESERVED)
goto errout;
/* The full 20 bit range may not be supported. */
if (index >= net->mpls.platform_labels)
goto errout; goto errout;
/* Append makes no sense with mpls */ /* Append makes no sense with mpls */
...@@ -800,12 +808,7 @@ static int mpls_route_del(struct mpls_route_config *cfg) ...@@ -800,12 +808,7 @@ static int mpls_route_del(struct mpls_route_config *cfg)
index = cfg->rc_label; index = cfg->rc_label;
/* Reserved labels may not be removed */ if (!mpls_label_ok(net, index))
if (index < MPLS_LABEL_FIRST_UNRESERVED)
goto errout;
/* The full 20 bit range may not be supported */
if (index >= net->mpls.platform_labels)
goto errout; goto errout;
mpls_route_update(net, index, NULL, &cfg->rc_nlinfo); mpls_route_update(net, index, NULL, &cfg->rc_nlinfo);
...@@ -1164,10 +1167,9 @@ static int rtm_to_route_config(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1164,10 +1167,9 @@ static int rtm_to_route_config(struct sk_buff *skb, struct nlmsghdr *nlh,
&cfg->rc_label)) &cfg->rc_label))
goto errout; goto errout;
/* Reserved labels may not be set */ if (!mpls_label_ok(cfg->rc_nlinfo.nl_net,
if (cfg->rc_label < MPLS_LABEL_FIRST_UNRESERVED) cfg->rc_label))
goto errout; goto errout;
break; break;
} }
case RTA_VIA: case RTA_VIA:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment