lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0361/1039] bpf: Add missing map_get_next_key method to bloom filter map.
    Date
    From: Haimin Zhang <tcs_kernel@tencent.com>

    [ Upstream commit 3ccdcee28415c4226de05438b4d89eb5514edf73 ]

    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: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Joanne Koong <joannekoong@fb.com>
    Link: https://lore.kernel.org/bpf/1640776802-22421-1-git-send-email-tcs.kernel@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 277a05e9c9849..b141a1346f72d 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.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:40    [W:2.393 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site