| Message ID | 20161115104612.13711.44592.stgit@ahduyck-blue-test.jf.intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2016-11-15 at 05:46 -0500, Alexander Duyck wrote: > Fix a small memory leak that can occur where we leak a fib_alias in the > event of us not being able to insert it into the local table. > > Fixes: 0ddcf43d5d4a0 ("ipv4: FIB Local/MAIN table collapse") > Reported-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> > --- > net/ipv4/fib_trie.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Acked-by: Eric Dumazet <edumazet@google.com>
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 735edc9..026f309 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1743,8 +1743,10 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb) local_l = fib_find_node(lt, &local_tp, l->key); if (fib_insert_alias(lt, local_tp, local_l, new_fa, - NULL, l->key)) + NULL, l->key)) { + kmem_cache_free(fn_alias_kmem, new_fa); goto out; + } } /* stop loop if key wrapped back to 0 */
Fix a small memory leak that can occur where we leak a fib_alias in the event of us not being able to insert it into the local table. Fixes: 0ddcf43d5d4a0 ("ipv4: FIB Local/MAIN table collapse") Reported-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> --- net/ipv4/fib_trie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)