author | Can Cao <can.cao@amlogic.com> | 2018-08-01 08:03:16 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@droid04> | 2018-08-01 08:03:16 (GMT) |
commit | 1c970f82603c2516cd4454a1f51f5133cfa10b7b (patch) | |
tree | 0a8cc4f11c92cf1cf413e501fe030cac9e36fb72 | |
parent | 789b880aca7fb6c73d87a0fb73e968477e3d83b7 (diff) | |
parent | 895704b20c09a8874f93aca4515a501f6bd762b9 (diff) | |
download | common-1c970f82603c2516cd4454a1f51f5133cfa10b7b.zip common-1c970f82603c2516cd4454a1f51f5133cfa10b7b.tar.gz common-1c970f82603c2516cd4454a1f51f5133cfa10b7b.tar.bz2 |
Merge "vts:fix VtsKernelNetTest [1/1] PD# 166455 fix testFindFirstMapKey (bpf_test.BpfTest)" into p-amlogic
-rw-r--r-- | kernel/bpf/arraymap.c | 2 | ||||
-rw-r--r-- | kernel/bpf/hashtab.c | 9 | ||||
-rw-r--r-- | kernel/bpf/syscall.c | 20 |
3 files changed, 18 insertions, 13 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 4db6a67..b30ca0f 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -194,7 +194,7 @@ int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value) static int array_map_get_next_key(struct bpf_map *map, void *key, void *next_key) { struct bpf_array *array = container_of(map, struct bpf_array, map); - u32 index = *(u32 *)key; + u32 index = key ? *(u32 *)key : U32_MAX; u32 *next = (u32 *)next_key; if (index >= array->map.max_entries) { diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index 27f4f2c..9c86d5d 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -328,12 +328,15 @@ static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key) struct hlist_head *head; struct htab_elem *l, *next_l; u32 hash, key_size; - int i; + int i = 0; WARN_ON_ONCE(!rcu_read_lock_held()); key_size = map->key_size; + if (!key) + goto find_first_elem; + hash = htab_map_hash(key, key_size); head = select_bucket(htab, hash); @@ -341,10 +344,8 @@ static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key) /* lookup the key */ l = lookup_elem_raw(head, hash, key, key_size); - if (!l) { - i = 0; + if (!l) goto find_first_elem; - } /* key was found, get next key in the same bucket */ next_l = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(&l->hash_node)), diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 41aa664..85ea598 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -579,14 +579,18 @@ static int map_get_next_key(union bpf_attr *attr) goto err_put; } - err = -ENOMEM; - key = kmalloc(map->key_size, GFP_USER); - if (!key) - goto err_put; - - err = -EFAULT; - if (copy_from_user(key, ukey, map->key_size) != 0) - goto free_key; + if (ukey) { + err = -ENOMEM; + key = kmalloc(map->key_size, GFP_USER); + if (!key) + goto err_put; + + err = -EFAULT; + if (copy_from_user(key, ukey, map->key_size) != 0) + goto free_key; + } else { + key = NULL; + } err = -ENOMEM; next_key = kmalloc(map->key_size, GFP_USER); |