Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed memory bloating on kernel merge paths together with export filter.

Browse source 
Some memory was being allocated from bad linpool, not from the given one
as they should.

Thanks to Madhu and Justin Cattle for reporting this.
This commit is contained in:
Jan Moskyto Matejka 2016-10-12 14:16:34 +02:00
parent 9df52a98e2
commit 2e7fb11a6e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nest/rt-table.c
View file

@ -65,7 +65,7 @@ make_tmp_attrs(struct rte *rt, struct linpool *pool)
{ {
struct ea_list *(*mta)(struct rte *rt, struct linpool *pool); struct ea_list *(*mta)(struct rte *rt, struct linpool *pool);
mta = rt->attrs->src->proto->make_tmp_attrs; mta = rt->attrs->src->proto->make_tmp_attrs;
return mta ? mta(rt, rte_update_pool) : NULL; return mta ? mta(rt, pool) : NULL;
} }
/* Like fib_route(), but skips empty net entries */ /* Like fib_route(), but skips empty net entries */
@ -596,7 +596,7 @@ mpnh_merge_rta(struct mpnh *nhs, rta *a, linpool *pool, int max)
{ {
struct mpnh nh = { .gw = a->gw, .iface = a->iface }; struct mpnh nh = { .gw = a->gw, .iface = a->iface };
struct mpnh *nh2 = (a->dest == RTD_MULTIPATH) ? a->nexthops : &nh; struct mpnh *nh2 = (a->dest == RTD_MULTIPATH) ? a->nexthops : &nh;
return mpnh_merge(nhs, nh2, 1, 0, max, rte_update_pool); return mpnh_merge(nhs, nh2, 1, 0, max, pool);
} }
rte * rte *