| Message ID | 1490739589-3039-1-git-send-email-dsa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 3/28/17, 3:19 PM, David Ahern wrote: > A recent commit skips nexthops in a route if the device has been > deleted. Update lfib_nlmsg_size accordingly. > > Reported-by: Roopa Prabhu <roopa@cumulusnetworks.com> > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> > --- > Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
On 28/03/17 23:19, David Ahern wrote: > A recent commit skips nexthops in a route if the device has been > deleted. Update lfib_nlmsg_size accordingly. > > Reported-by: Roopa Prabhu <roopa@cumulusnetworks.com> > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Acked-by: Robert Shearman <rshearma@brocade.com>
From: David Ahern <dsa@cumulusnetworks.com> Date: Tue, 28 Mar 2017 15:19:49 -0700 > A recent commit skips nexthops in a route if the device has been > deleted. Update lfib_nlmsg_size accordingly. > > Reported-by: Roopa Prabhu <roopa@cumulusnetworks.com> > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Applied, thanks.
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 74755920c689..0d08229c98c9 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1876,6 +1876,8 @@ static inline size_t lfib_nlmsg_size(struct mpls_route *rt) size_t nhsize = 0; for_nexthops(rt) { + if (!rtnl_dereference(nh->nh_dev)) + continue; nhsize += nla_total_size(sizeof(struct rtnexthop)); /* RTA_VIA */ if (nh->nh_via_table != MPLS_NEIGH_TABLE_UNSPEC)
A recent commit skips nexthops in a route if the device has been deleted. Update lfib_nlmsg_size accordingly. Reported-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David Ahern <dsa@cumulusnetworks.com> --- net/mpls/af_mpls.c | 2 ++ 1 file changed, 2 insertions(+)