Commit 2f3f7d1f authored Jun 07, 2019 by George Wilkie Committed by David S. Miller Jun 09, 2019

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: e3e4712e ("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>

parent a9520543

net/mpls/mpls_iptunnel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 },
		};

Admin message