diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2016-11-15 05:46:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-16 13:24:50 -0500 |
| commit | 3114cdfe66c156345b0ae34e2990472f277e0c1b (patch) | |
| tree | 356e4a21747a35c5e3347cb7fc6bc75c9397d769 /net | |
| parent | 3b7093346b326e5d3590c7d49f6aefe6fa5b2c9a (diff) | |
| download | talos-obmc-linux-3114cdfe66c156345b0ae34e2990472f277e0c1b.tar.gz talos-obmc-linux-3114cdfe66c156345b0ae34e2990472f277e0c1b.zip | |
ipv4: Fix memory leak in exception case for splitting tries
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>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/fib_trie.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 735edc9d41a2..026f309c51e9 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 */ |
