From: Markus Elfring <Markus.Elfring@web.de>
To: bpf@vger.kernel.org, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>, Stanislav Fomichev <sdf@google.com>,
Yonghong Song <yonghong.song@linux.dev>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/5] bpf: Improve exception handling in trie_update_elem()
Date: Sat, 30 Dec 2023 21:14:13 +0100 [thread overview]
Message-ID: <d6294506-75a8-4a23-aa98-65b719c1d368@web.de> (raw)
In-Reply-To: <7011cdcc-4287-4e63-8bfa-f08710f670b1@web.de>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 30 Dec 2023 20:28:11 +0100
The kfree() function was called in some cases by
the trie_update_elem() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
* Thus adjust jump targets.
* Reorder data processing steps at the end.
* Delete an initialisation (for the variable “new_node”)
and a repeated pointer check which became unnecessary
with this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
kernel/bpf/lpm_trie.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
index b32be680da6c..6c372d831d0f 100644
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
@@ -307,7 +307,7 @@ static long 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 = NULL, *new_node = NULL;
+ struct lpm_trie_node *node, *im_node = NULL, *new_node;
struct lpm_trie_node __rcu **slot;
struct bpf_lpm_trie_key *key = _key;
unsigned long irq_flags;
@@ -327,13 +327,13 @@ static long trie_update_elem(struct bpf_map *map,
if (trie->n_entries == trie->map.max_entries) {
ret = -ENOSPC;
- goto out;
+ goto unlock;
}
new_node = lpm_trie_node_alloc(trie, value);
if (!new_node) {
ret = -ENOMEM;
- goto out;
+ goto unlock;
}
trie->n_entries++;
@@ -368,7 +368,7 @@ static long trie_update_elem(struct bpf_map *map,
*/
if (!node) {
rcu_assign_pointer(*slot, new_node);
- goto out;
+ goto decrement_counter;
}
/* If the slot we picked already exists, replace it with @new_node
@@ -384,7 +384,7 @@ static long trie_update_elem(struct bpf_map *map,
rcu_assign_pointer(*slot, new_node);
kfree_rcu(node, rcu);
- goto out;
+ goto decrement_counter;
}
/* If the new node matches the prefix completely, it must be inserted
@@ -394,13 +394,13 @@ static long trie_update_elem(struct bpf_map *map,
next_bit = extract_bit(node->data, matchlen);
rcu_assign_pointer(new_node->child[next_bit], node);
rcu_assign_pointer(*slot, new_node);
- goto out;
+ goto decrement_counter;
}
im_node = lpm_trie_node_alloc(trie, NULL);
if (!im_node) {
ret = -ENOMEM;
- goto out;
+ goto decrement_counter;
}
im_node->prefixlen = matchlen;
@@ -419,15 +419,13 @@ static long trie_update_elem(struct bpf_map *map,
/* Finally, assign the intermediate node to the determined slot */
rcu_assign_pointer(*slot, im_node);
-out:
if (ret) {
- if (new_node)
- trie->n_entries--;
-
- kfree(new_node);
kfree(im_node);
+decrement_counter:
+ trie->n_entries--;
+ kfree(new_node);
}
-
+unlock:
spin_unlock_irqrestore(&trie->lock, irq_flags);
return ret;
--
2.43.0
next prev parent reply other threads:[~2023-12-30 20:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 20:04 [PATCH 0/5] bpf: Adjustments for four function implementations Markus Elfring
2023-12-30 20:06 ` [PATCH 1/5] bpf: Improve exception handling in bpf_struct_ops_link_create() Markus Elfring
2023-12-30 20:08 ` [PATCH 2/5] bpf: Move an assignment for the variable “st_map” " Markus Elfring
2023-12-30 20:10 ` [PATCH 3/5] bpf: Improve exception handling in bpf_core_apply() Markus Elfring
2023-12-30 20:12 ` [PATCH 4/5] bpf: Return directly after a failed bpf_map_kmalloc_node() in bpf_cgroup_storage_alloc() Markus Elfring
2023-12-30 20:14 ` Markus Elfring [this message]
2023-12-31 22:28 ` [PATCH 0/5] bpf: Adjustments for four function implementations Alexei Starovoitov
2024-01-01 9:10 ` Markus Elfring
2024-01-02 17:25 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d6294506-75a8-4a23-aa98-65b719c1d368@web.de \
--to=markus.elfring@web.de \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).