Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36cc3435 authored by Björn Töpel's avatar Björn Töpel Committed by Daniel Borkmann
Browse files

xsk: support BPF_EXIST and BPF_NOEXIST flags in XSKMAP 



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

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 0402acd6

kernel/bpf/xskmap.c

+6 −2
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value, 
		return -EINVAL;

	if (unlikely(i >= m->map.max_entries))

		return -E2BIG;

	if (unlikely(map_flags == BPF_NOEXIST))

		return -EEXIST;



	sock = sockfd_lookup(fd, &err);

	if (!sock)
@@ -257,6 +255,12 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value, 
	if (old_xs == xs) {

		err = 0;

		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);

	WRITE_ONCE(*map_entry, xs);