diff options
| author | Guillaume Nault <gnault@redhat.com> | 2020-03-11 16:16:36 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2020-03-15 09:56:53 -0700 |
| commit | 72cc0bafb9f8af217283f7757397242cb7ca8b2d (patch) | |
| tree | 9948f76bfedf92e07cd1b89ef50ff8b2030c72b7 | |
| parent | d9b868436a6fce8986560178c6d1a78072e21861 (diff) | |
| download | iproute2-72cc0bafb9f8af217283f7757397242cb7ca8b2d.tar.gz | |
iproute2: fix MPLS label parsing
The initial value of "label" in parse_mpls() is 0xffffffff. Therefore
we should test for this value, and not 0, to detect if a label has been
provided. The "!label" test not only fails to detect a missing label
parameter, it also prevents the use of the IPv4 explicit NULL label,
which actually equals 0.
Reproducer:
$ ip link add name dm0 type dummy
$ tc qdisc add dev dm0 ingress
$ tc filter add dev dm0 parent ffff: matchall action mpls push
Error: act_mpls: Label is required for MPLS push.
We have an error talking to the kernel
--> Filter was pushed to the kernel, where it got rejected.
$ tc filter add dev dm0 parent ffff: matchall action mpls push label 0
Error: argument "label" is required
--> Label 0 was rejected by iproute2.
Expected result:
$ tc filter add dev dm0 parent ffff: matchall action mpls push
Error: argument "label" is required
--> Filter was directly rejected by iproute2.
$ tc filter add dev dm0 parent ffff: matchall action mpls push label 0
--> Filter is accepted.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | tc/m_mpls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tc/m_mpls.c b/tc/m_mpls.c index 6f3a39f43..50eba01cb 100644 --- a/tc/m_mpls.c +++ b/tc/m_mpls.c @@ -156,7 +156,7 @@ static int parse_mpls(struct action_util *a, int *argc_p, char ***argv_p, } } - if (action == TCA_MPLS_ACT_PUSH && !label) + if (action == TCA_MPLS_ACT_PUSH && label == 0xffffffff) missarg("label"); if (action == TCA_MPLS_ACT_PUSH && proto && |