| Message ID | 6052894aa1bd4df5a5c7aaa05f5b63a980cbe371.1485217298.git.daniel@iogearbox.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 24, 2017 at 01:26:46AM +0100, Daniel Borkmann wrote: > We need to initialize im_node to NULL, otherwise in case of error path > it gets passed to kfree() as uninitialized pointer. > > Fixes: b95a5c4db09b ("bpf: add a longest prefix match trie map implementation") > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Great catch. Acked-by: Alexei Starovoitov <ast@kernel.org>
From: Daniel Borkmann <daniel@iogearbox.net> Date: Tue, 24 Jan 2017 01:26:46 +0100 > We need to initialize im_node to NULL, otherwise in case of error path > it gets passed to kfree() as uninitialized pointer. > > Fixes: b95a5c4db09b ("bpf: add a longest prefix match trie map implementation") > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> > --- > Mentioned it in http://patchwork.ozlabs.org/patch/718070/, but > was probably overlooked. Applied, thanks.
diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c index ba19241d..144e976 100644 --- a/kernel/bpf/lpm_trie.c +++ b/kernel/bpf/lpm_trie.c @@ -262,7 +262,7 @@ static int trie_update_elem(struct bpf_map *map, void *_key, void *value, u64 flags) { struct lpm_trie *trie = container_of(map, struct lpm_trie, map); - struct lpm_trie_node *node, *im_node, *new_node = NULL; + struct lpm_trie_node *node, *im_node = NULL, *new_node = NULL; struct lpm_trie_node __rcu **slot; struct bpf_lpm_trie_key *key = _key; unsigned long irq_flags;
We need to initialize im_node to NULL, otherwise in case of error path it gets passed to kfree() as uninitialized pointer. Fixes: b95a5c4db09b ("bpf: add a longest prefix match trie map implementation") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> --- Mentioned it in http://patchwork.ozlabs.org/patch/718070/, but was probably overlooked. kernel/bpf/lpm_trie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)