[PATCH v2] bpf: Add missing map_get_next_key method to bloom filter map

[PATCH v2] bpf: Add missing map_get_next_key method to bloom filter map

[tcs.kernel]

From: Haimin Zhang <tcs_kernel@tencent.com>

Without it, kernel crashes in map_get_next_key().

Fixes: 9330986c0300 ("bpf: Add bloom filter map implementation")

Reported-by: TCS Robot <tcs_robot@tencent.com>
Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 kernel/bpf/bloom_filter.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/bpf/bloom_filter.c b/kernel/bpf/bloom_filter.c
index 277a05e9c984..fa34dc871995 100644
--- a/kernel/bpf/bloom_filter.c
+++ b/kernel/bpf/bloom_filter.c
@@ -82,6 +82,11 @@ static int bloom_map_delete_elem(struct bpf_map *map, void *value)
 	return -EOPNOTSUPP;
 }
 
+static int bloom_map_get_next_key(struct bpf_map *map, void *key, void *next_key)
+{
+	return -EOPNOTSUPP;
+}
+
 static struct bpf_map *bloom_map_alloc(union bpf_attr *attr)
 {
 	u32 bitset_bytes, bitset_mask, nr_hash_funcs, nr_bits;
@@ -192,6 +197,7 @@ const struct bpf_map_ops bloom_filter_map_ops = {
 	.map_meta_equal = bpf_map_meta_equal,
 	.map_alloc = bloom_map_alloc,
 	.map_free = bloom_map_free,
+	.map_get_next_key = bloom_map_get_next_key,
 	.map_push_elem = bloom_map_push_elem,
 	.map_peek_elem = bloom_map_peek_elem,
 	.map_pop_elem = bloom_map_pop_elem,
-- 
2.27.0

Re: [PATCH v2] bpf: Add missing map_get_next_key method to bloom filter map

[Joanne Koong]

On 12/29/21 3:20 AM, tcs.kernel@gmail.com wrote:

> From: Haimin Zhang <tcs_kernel@tencent.com>
>
> Without it, kernel crashes in map_get_next_key().
>
> Fixes: 9330986c0300 ("bpf: Add bloom filter map implementation")
>
> Reported-by: TCS Robot <tcs_robot@tencent.com>
> Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
> ---

Thanks for fixing this. I'll take a look at the other bpf_map_ops and see if
there are other missing ones.

Acked-by: Joanne Koong <joannekoong@fb.com>
>   kernel/bpf/bloom_filter.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/kernel/bpf/bloom_filter.c b/kernel/bpf/bloom_filter.c
> index 277a05e9c984..fa34dc871995 100644
> --- a/kernel/bpf/bloom_filter.c
> +++ b/kernel/bpf/bloom_filter.c
> @@ -82,6 +82,11 @@ static int bloom_map_delete_elem(struct bpf_map *map, void *value)
>   	return -EOPNOTSUPP;
>   }
>   
> +static int bloom_map_get_next_key(struct bpf_map *map, void *key, void *next_key)
> +{
> +	return -EOPNOTSUPP;
> +}
> +
>   static struct bpf_map *bloom_map_alloc(union bpf_attr *attr)
>   {
>   	u32 bitset_bytes, bitset_mask, nr_hash_funcs, nr_bits;
> @@ -192,6 +197,7 @@ const struct bpf_map_ops bloom_filter_map_ops = {
>   	.map_meta_equal = bpf_map_meta_equal,
>   	.map_alloc = bloom_map_alloc,
>   	.map_free = bloom_map_free,
> +	.map_get_next_key = bloom_map_get_next_key,
>   	.map_push_elem = bloom_map_push_elem,
>   	.map_peek_elem = bloom_map_peek_elem,
>   	.map_pop_elem = bloom_map_pop_elem,

Re: [PATCH v2] bpf: Add missing map_get_next_key method to bloom filter map

[Alexei Starovoitov]

On Wed, Dec 29, 2021 at 9:22 AM Joanne Koong <joannekoong@fb.com> wrote:
>
> On 12/29/21 3:20 AM, tcs.kernel@gmail.com wrote:
>
> > From: Haimin Zhang <tcs_kernel@tencent.com>
> >
> > Without it, kernel crashes in map_get_next_key().
> >
> > Fixes: 9330986c0300 ("bpf: Add bloom filter map implementation")
> >
> > Reported-by: TCS Robot <tcs_robot@tencent.com>
> > Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
> > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Haimin,

Daniel didn't give you his SOB in v1 patch, so I've dropped it
while applying.


> > ---
>
> Thanks for fixing this. I'll take a look at the other bpf_map_ops and see if
> there are other missing ones.
>
> Acked-by: Joanne Koong <joannekoong@fb.com>


Thanks everyone.