diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-09-21 14:49:31 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-09-21 16:21:09 +0200 |
| commit | a74e593b3545374a9021f8264152dba42e08323a (patch) | |
| tree | f4e3c701b0bbf97aa03d4cfc3bee2baddb639bad /ospf6d/ospf6_zebra.c | |
| parent | Merge pull request #1212 from mkanjari/init-fix (diff) | |
| download | frr-a74e593b3545374a9021f8264152dba42e08323a.tar.xz frr-a74e593b3545374a9021f8264152dba42e08323a.zip | |
*: fix segfault when sending more than MULTIPATH_NUM nexthops
This is a fallout from PR #1022 (zapi consolidation). In the early days,
the client daemons would allocate enough memory to send all nexthops
to zebra. Then zebra would add all nexthops to the RIB and respect
MULTIPATH_NUM only when installing the routes in the kernel. Now things
are different and the client daemons can send at most MULTIPATH_NUM
nexthops to zebra, and failure to respect that will result in a buffer
overflow. The MULTIPATH_NUM limit in the new zebra API is a small price
we pay to avoid allocating memory for each route sent to zebra.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_zebra.c')
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 2372bc54b..30bb4393c 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -341,8 +341,8 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request) api.safi = SAFI_UNICAST; api.prefix = *dest; SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP); - api.nexthop_num = nhcount; - ospf6_route_zebra_copy_nexthops(request, api.nexthops, nhcount); + api.nexthop_num = MIN(nhcount, MULTIPATH_NUM); + ospf6_route_zebra_copy_nexthops(request, api.nexthops, api.nexthop_num); SET_FLAG(api.message, ZAPI_MESSAGE_METRIC); api.metric = (request->path.metric_type == 2 ? request->path.u.cost_e2 : request->path.cost); |