Skip to content

Commit

Permalink
bpf: fix memory leak in lpm_trie map_free callback function
Browse files Browse the repository at this point in the history
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.

Fixes: b95a5c4 ("bpf: add a longest prefix match trie map implementation")
Reported-by: Mathieu Malaterre <malat@debian.org>
Reported-by: Alexei Starovoitov <ast@kernel.org>
Tested-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
yonghong-song authored and Alexei Starovoitov committed Feb 14, 2018
1 parent d4014d8 commit 9a3efb6
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions kernel/bpf/lpm_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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];
Expand All @@ -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)
Expand Down

0 comments on commit 9a3efb6

Please sign in to comment.