Commit 02f8211b authored by Alban Crequy's avatar Alban Crequy Committed by Greg Kroah-Hartman

bpf, lpm: fix lookup bug in map_delete_elem

[ Upstream commit 7c0cdf0b ]

trie_delete_elem() was deleting an entry even though it was not matching
if the prefixlen was correct. This patch adds a check on matchlen.

Reproducer:

$ sudo bpftool map create /sys/fs/bpf/mylpm type lpm_trie key 8 value 1 entries 128 name mylpm flags 1
$ sudo bpftool map update pinned /sys/fs/bpf/mylpm key hex 10 00 00 00 aa bb cc dd value hex 01
$ sudo bpftool map dump pinned /sys/fs/bpf/mylpm
key: 10 00 00 00 aa bb cc dd  value: 01
Found 1 element
$ sudo bpftool map delete pinned /sys/fs/bpf/mylpm key hex 10 00 00 00 ff ff ff ff
$ echo $?
0
$ sudo bpftool map dump pinned /sys/fs/bpf/mylpm
Found 0 elements

A similar reproducer is added in the selftests.

Without the patch:

$ sudo ./tools/testing/selftests/bpf/test_lpm_map
test_lpm_map: test_lpm_map.c:485: test_lpm_delete: Assertion `bpf_map_delete_elem(map_fd, key) == -1 && errno == ENOENT' failed.
Aborted

With the patch: test_lpm_map runs without errors.

Fixes: e454cf59 ("bpf: Implement map_delete_elem for BPF_MAP_TYPE_LPM_TRIE")
Cc: Craig Gallek <kraig@google.com>
Signed-off-by: default avatarAlban Crequy <alban@kinvolk.io>
Acked-by: default avatarCraig Gallek <kraig@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c5f37906
...@@ -432,6 +432,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key) ...@@ -432,6 +432,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
} }
if (!node || node->prefixlen != key->prefixlen || if (!node || node->prefixlen != key->prefixlen ||
node->prefixlen != matchlen ||
(node->flags & LPM_TREE_NODE_FLAG_IM)) { (node->flags & LPM_TREE_NODE_FLAG_IM)) {
ret = -ENOENT; ret = -ENOENT;
goto out; goto out;
......
...@@ -474,6 +474,16 @@ static void test_lpm_delete(void) ...@@ -474,6 +474,16 @@ static void test_lpm_delete(void)
assert(bpf_map_lookup_elem(map_fd, key, &value) == -1 && assert(bpf_map_lookup_elem(map_fd, key, &value) == -1 &&
errno == ENOENT); errno == ENOENT);
key->prefixlen = 30; // unused prefix so far
inet_pton(AF_INET, "192.255.0.0", key->data);
assert(bpf_map_delete_elem(map_fd, key) == -1 &&
errno == ENOENT);
key->prefixlen = 16; // same prefix as the root node
inet_pton(AF_INET, "192.255.0.0", key->data);
assert(bpf_map_delete_elem(map_fd, key) == -1 &&
errno == ENOENT);
/* assert initial lookup */ /* assert initial lookup */
key->prefixlen = 32; key->prefixlen = 32;
inet_pton(AF_INET, "192.168.0.1", key->data); inet_pton(AF_INET, "192.168.0.1", key->data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment