]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
mpls: fix warning with multi-label encap
authorGeorge Wilkie <gwilkie@vyatta.att-mail.com>
Fri, 7 Jun 2019 10:49:41 +0000 (11:49 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
commit7d28216351edcab392d571483bf22758e7c1fa79
tree15c1711e5ff6ddf85f76b2892012d057f1dc39eb
parentd2d525b21d46fcf3039191b729f8aaacaec7e3f5
mpls: fix warning with multi-label encap

BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
net/mpls/mpls_iptunnel.c