Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1565892 > unrolled thread

[PATCH] bpf: don't kfree an uninitialized im_node

Started byColin King <colin.king@canonical.com>
First post2017-01-24 15:20 +0100
Last post2017-01-24 19:00 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] bpf: don't kfree an uninitialized im_node Colin King <colin.king@canonical.com> - 2017-01-24 15:20 +0100
    Re: [PATCH] bpf: don't kfree an uninitialized im_node Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2017-01-24 19:00 +0100

#1565892 — [PATCH] bpf: don't kfree an uninitialized im_node

FromColin King <colin.king@canonical.com>
Date2017-01-24 15:20 +0100
Subject[PATCH] bpf: don't kfree an uninitialized im_node
Message-ID<t3a6Z-5lN-17@gated-at.bofh.it>
From: Colin Ian King <colin.king@canonical.com>

There are some error exit paths to the label 'out' that end up
kfree'ing an uninitialized im_node.  Fix this by inititializing
im_node to NULL to avoid kfree'ing a garbage address.

Issue found by CoverityScan, CID#1398022 ("Uninitialized pointer read")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 kernel/bpf/lpm_trie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.10.2

[toc] | [next] | [standalone]


#1566030

FromAlexei Starovoitov <alexei.starovoitov@gmail.com>
Date2017-01-24 19:00 +0100
Message-ID<t3dxU-7k1-7@gated-at.bofh.it>
In reply to#1565892
On Tue, Jan 24, 2017 at 6:16 AM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> There are some error exit paths to the label 'out' that end up
> kfree'ing an uninitialized im_node.  Fix this by inititializing
> im_node to NULL to avoid kfree'ing a garbage address.

this fix already landed. See:
commit d140199af510 ("bpf, lpm: fix kfree of im_node in trie_update_elem")

> Issue found by CoverityScan, CID#1398022 ("Uninitialized pointer read")

Nice. Good to know that static analysis can do such checks.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web