bpf: fix memory leak in lpm_trie map_free callback function
Subsystems (3)
PATCH v2 1/1 bpf: fix memory leak in lpm_trie map_free callback function
There is a memory leak happening in lpm_trie map_free callback function trie_free. The trie structure itself does not get freed.
Also, trie_free function did not do synchronize_rcu before freeing various data structures. This is incorrect as some rcu_read_lock region(s) for lookup, update, delete or get_next_key may not complete yet. The fix is to add synchronize_rcu in the beginning of trie_free. The useless spin_lock is removed from this function as well.
--- kernel/bpf/lpm_trie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
v1->v2:
Make comments more precise and make label name more appropriate, as suggested by Daniel
kernel/bpf/lpm_trie.c +7 -4
@@ -555,7 +555,10 @@ static void trie_free(struct bpf_map *map)struct lpm_trie_node __rcu **slot;struct lpm_trie_node *node; -raw_spin_lock (&trie->lock); +/* Wait for outstanding programs to complete +* update/lookup/delete/get_next_key and free the trie. +*/ +synchronize_rcu ();/* Always start at the root and walk down to a node that has no * children. Then free that node, nullify its reference in the parent
@@ -569,7 +572,7 @@ static void trie_free(struct bpf_map *map) node =rcu_dereference_protected (*slot,lockdep_is_held (&trie->lock));if (!node) - goto unlock; + goto out;if (rcu_access_pointer (node->child[0 ])) { slot = &node->child[0 ];
@@ -587,8 +590,8 @@ static void trie_free(struct bpf_map *map) } } -unlock: -raw_spin_unlock (&trie->lock); +out: +kfree (trie); }static int trie_get_next_key (struct bpf_map *map,void *_key,void *_next_key)
Signature · 1 line
2.9.5
Alexei Starovoitov
AppliedQuoted 14 lines · Yonghong Song
There is a memory leak happening in
lpm_triemap_freecallback functiontrie_free. The trie structure itself does not get freed.Also,
trie_freefunction did not dosynchronize_rcubefore freeing various data structures. This is incorrect as somercu_read_lockregion(s) for lookup, update, delete orget_next_keymay not complete yet. The fix is to addsynchronize_rcuin the beginning oftrie_free. The uselessspin_lockis removed from this function as well.Fixes b95a5c4db09b ("bpf: add a longest prefix match trie map implementation")Reported-by Mathieu Malaterre <[email protected]>Reported-by Alexei Starovoitov <[email protected]>Tested-by Mathieu Malaterre <[email protected]>Signed-off-by Yonghong Song <[email protected]>
Quoted 7 lines
--- kernel/bpf/lpm_trie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
v1->v2:
Make comments more precise and make label name more appropriate, as suggested by Daniel
Applied to bpf tree, Thanks Yonghong.
Quoted 19 lines · Alexei Starovoitov
Quoted 18 lines · Yonghong Song
There is a memory leak happening in
lpm_triemap_freecallback functiontrie_free. The trie structure itself does not get freed.Also,
trie_freefunction did not dosynchronize_rcubefore freeing various data structures. This is incorrect as somercu_read_lockregion(s) for lookup, update, delete orget_next_keymay not complete yet. The fix is to addsynchronize_rcuin the beginning oftrie_free. The uselessspin_lockis removed from this function as well.Fixes b95a5c4db09b ("bpf: add a longest prefix match trie map implementation")Reported-by Mathieu Malaterre <[email protected]>Reported-by Alexei Starovoitov <[email protected]>Tested-by Mathieu Malaterre <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- kernel/bpf/lpm_trie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
Quoted 5 lines
Quoted 3 lines
v1->v2:
Make comments more precise and make label name more appropriate, as suggested by DanielApplied to bpf tree, Thanks Yonghong.
This does not look good.
LOCKDEP surely should complain to
node = rcu_dereference_protected(*slot, lockdep_is_held(&trie->lock));
Since we no longer hold trie->lock
Quoted 27 lines · Eric Dumazet
Quoted 19 lines · Alexei Starovoitov
Quoted 18 lines · Yonghong Song
There is a memory leak happening in
lpm_triemap_freecallback functiontrie_free. The trie structure itself does not get freed.Also,
trie_freefunction did not dosynchronize_rcubefore freeing various data structures. This is incorrect as somercu_read_lockregion(s) for lookup, update, delete orget_next_keymay not complete yet. The fix is to addsynchronize_rcuin the beginning oftrie_free. The uselessspin_lockis removed from this function as well.Fixes b95a5c4db09b ("bpf: add a longest prefix match trie map implementation")Reported-by Mathieu Malaterre <[email protected]>Reported-by Alexei Starovoitov <[email protected]>Tested-by Mathieu Malaterre <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- kernel/bpf/lpm_trie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)Quoted 5 lines
Quoted 3 lines
v1->v2:
Make comments more precise and make label name more appropriate, as suggested by DanielApplied to bpf tree, Thanks Yonghong.
Quoted 7 lines
This does not look good.
LOCKDEP surely should complain to
node =
rcu_dereference_protected(*slot, lockdep_is_held(&trie->lock));Since we no longer hold
trie->lock
Eric,
Thanks for spotting this issue. Will fix this issue soon.
Yonghong