| Message ID | 1429697679-13767-4-git-send-email-rshearma@brocade.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Robert Shearman <rshearma@brocade.com> writes: > The reserved implicit-NULL label isn't allowed to appear in the label > stack for packets, so make it an error for the control plane to > specify it as an outgoing label. Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> > > Suggested-by: "Eric W. Biederman" <ebiederm@xmission.com> > Signed-off-by: Robert Shearman <rshearma@brocade.com> > --- > net/mpls/af_mpls.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c > index 9fdd94cba83e..954810c76a86 100644 > --- a/net/mpls/af_mpls.c > +++ b/net/mpls/af_mpls.c > @@ -646,6 +646,15 @@ int nla_get_labels(const struct nlattr *nla, > if ((dec.bos != bos) || dec.ttl || dec.tc) > return -EINVAL; > > + switch (dec.label) { > + case LABEL_IMPLICIT_NULL: > + /* RFC3032: This is a label that an LSR may > + * assign and distribute, but which never > + * actually appears in the encapsulation. > + */ > + return -EINVAL; > + } > + > label[i] = dec.label; > } > *labels = nla_labels; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 9fdd94cba83e..954810c76a86 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -646,6 +646,15 @@ int nla_get_labels(const struct nlattr *nla, if ((dec.bos != bos) || dec.ttl || dec.tc) return -EINVAL; + switch (dec.label) { + case LABEL_IMPLICIT_NULL: + /* RFC3032: This is a label that an LSR may + * assign and distribute, but which never + * actually appears in the encapsulation. + */ + return -EINVAL; + } + label[i] = dec.label; } *labels = nla_labels;
The reserved implicit-NULL label isn't allowed to appear in the label stack for packets, so make it an error for the control plane to specify it as an outgoing label. Suggested-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Robert Shearman <rshearma@brocade.com> --- net/mpls/af_mpls.c | 9 +++++++++ 1 file changed, 9 insertions(+)