mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

xsk: support BPF_EXIST and BPF_NOEXIST flags in XSKMAP

Browse source 
The XSKMAP did not honor the BPF_EXIST/BPF_NOEXIST flags when updating
an entry. This patch addresses that.

Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Björn Töpel 2019-08-15 11:30:14 +02:00 committed by Daniel Borkmann
parent 0402acd683
commit 36cc34358c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/bpf/xskmap.c
View file

@ -226,8 +226,6 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value,
return -EINVAL; return -EINVAL;
if (unlikely(i >= m->map.max_entries)) if (unlikely(i >= m->map.max_entries))
return -E2BIG; return -E2BIG;
if (unlikely(map_flags == BPF_NOEXIST))
return -EEXIST;
sock = sockfd_lookup(fd, &err); sock = sockfd_lookup(fd, &err);
if (!sock) if (!sock)
@ -257,6 +255,12 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value,
if (old_xs == xs) { if (old_xs == xs) {
err = 0; err = 0;
goto out; goto out;
} else if (old_xs && map_flags == BPF_NOEXIST) {
err = -EEXIST;
goto out;
} else if (!old_xs && map_flags == BPF_EXIST) {
err = -ENOENT;
goto out;
} }
xsk_map_sock_add(xs, node); xsk_map_sock_add(xs, node);
WRITE_ONCE(*map_entry, xs); WRITE_ONCE(*map_entry, xs);