diff options
| author | George Wilkie <gwilkie@vyatta.att-mail.com> | 2019-06-07 11:49:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-09 13:26:34 -0700 |
| commit | 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 (patch) | |
| tree | 460037ec16968d82f3d3d9e3a75f8b6ce4c3adfe /net/mpls | |
| parent | a9520543b123bbd7275a0ab8d0375a5412683b41 (diff) | |
| download | lwn-2f3f7d1fa0d1039b24a55d127ed190f196fc3e79.tar.gz lwn-2f3f7d1fa0d1039b24a55d127ed190f196fc3e79.zip | |
mpls: fix warning with multi-label encap
If you configure a route with multiple labels, e.g.
ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4
A warning is logged:
kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid
length.
This happens because mpls_iptunnel_policy has set the type of
MPLS_IPTUNNEL_DST to fixed size NLA_U32.
Change it to a minimum size.
nla_get_labels() does the remaining validation.
Fixes: e3e4712ec096 ("mpls: ip tunnel support")
Signed-off-by: George Wilkie <gwilkie@vyatta.att-mail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
| -rw-r--r-- | net/mpls/mpls_iptunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c index 500596130760..d25e91d7bdc1 100644 --- a/net/mpls/mpls_iptunnel.c +++ b/net/mpls/mpls_iptunnel.c @@ -23,7 +23,7 @@ #include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX + 1] = { - [MPLS_IPTUNNEL_DST] = { .type = NLA_U32 }, + [MPLS_IPTUNNEL_DST] = { .len = sizeof(u32) }, [MPLS_IPTUNNEL_TTL] = { .type = NLA_U8 }, }; |