diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-16 13:24:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-16 13:24:51 -0500 |
| commit | b71de936c38e80d1f059fd54d8704e9d86d6bd10 (patch) | |
| tree | 356e4a21747a35c5e3347cb7fc6bc75c9397d769 /include | |
| parent | f23cc643f9baec7f71f2b74692da3cf03abbbfda (diff) | |
| parent | 3114cdfe66c156345b0ae34e2990472f277e0c1b (diff) | |
| download | cachepc-linux-b71de936c38e80d1f059fd54d8704e9d86d6bd10.tar.gz cachepc-linux-b71de936c38e80d1f059fd54d8704e9d86d6bd10.zip | |
Merge branch 'fib-tables-fixes'
Alexander Duyck says:
====================
ipv4: Fix memory leaks and reference issues in fib
This series fixes one major issue and one minor issue in the fib tables.
The major issue is that we had lost the functionality that was flushing the
local table entries from main after we had unmerged the two tries. In
order to regain the functionality I have performed a partial revert and
then moved the functionality for flushing the external entries from main
into fib_unmerge.
The minor issue was a memory leak that could occur in the event that we
weren't able to add an alias to the local trie resulting in the fib alias
being leaked.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_fib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index b9314b48e39f..f390c3bb05c5 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -243,6 +243,7 @@ int fib_table_dump(struct fib_table *table, struct sk_buff *skb, struct netlink_callback *cb); int fib_table_flush(struct net *net, struct fib_table *table); struct fib_table *fib_trie_unmerge(struct fib_table *main_tb); +void fib_table_flush_external(struct fib_table *table); void fib_free_table(struct fib_table *tb); #ifndef CONFIG_IP_MULTIPLE_TABLES |