path: root/net/mpls
diff options
authorRobert Shearman <rshearma@brocade.com>2015-12-10 19:30:48 +0000
committerDavid S. Miller <davem@davemloft.net>2015-12-12 00:43:44 -0500
commita3e948e83a302c63f196512e253067ded6bbc832 (patch)
treeaa6ceb9dafde5d1279b18da1e994f35a38f361a2 /net/mpls
parentf1c2ef40c6436f8fa287ff1be2c75c4932180b1f (diff)
mpls: validate L2 via address length
If an L2 via address for an mpls nexthop is specified, the length of the L2 address must match that expected by the output device, otherwise it could access memory beyond the end of the via address buffer in the route. This check was present prior to commit f8efb73c97e2 ("mpls: multipath route support"), but got lost in the refactoring, so add it back, applying it to all nexthops in multipath routes. Fixes: f8efb73c97e2 ("mpls: multipath route support") Signed-off-by: Robert Shearman <rshearma@brocade.com> Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index c70d750148b6..3be29cb1f658 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -534,6 +534,10 @@ static int mpls_nh_assign_dev(struct net *net, struct mpls_route *rt,
if (!mpls_dev_get(dev))
goto errout;
+ if ((nh->nh_via_table == NEIGH_LINK_TABLE) &&
+ (dev->addr_len != nh->nh_via_alen))
+ goto errout;
RCU_INIT_POINTER(nh->nh_dev, dev);
return 0;