lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190504160603.10173-3-bjorn.topel@gmail.com> Date: Sat, 4 May 2019 18:06:03 +0200 From: Björn Töpel <bjorn.topel@...il.com> To: ast@...nel.org, daniel@...earbox.net, netdev@...r.kernel.org Cc: Björn Töpel <bjorn.topel@...el.com>, magnus.karlsson@...el.com, magnus.karlsson@...il.com, bruce.richarson@...el.com, bpf@...r.kernel.org Subject: [PATCH bpf-next 2/2] xsk: honor BPF_EXIST and BPF_NOEXIST flags in XSKMAP From: Björn Töpel <bjorn.topel@...el.com> 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@...el.com> --- kernel/bpf/xskmap.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/xskmap.c b/kernel/bpf/xskmap.c index ad15e8e92a87..4214ea7b8cfc 100644 --- a/kernel/bpf/xskmap.c +++ b/kernel/bpf/xskmap.c @@ -236,8 +236,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) @@ -263,15 +261,28 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value, spin_lock_bh(&m->lock); entry = &m->xsk_map[i]; + old_xs = *entry; + 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_node_init(node, m, entry); xsk_map_add_node(xs, node); - old_xs = xchg(entry, xs); if (old_xs) xsk_map_del_node(old_xs, entry); spin_unlock_bh(&m->lock); sockfd_put(sock); return 0; + +out: + spin_unlock_bh(&m->lock); + sockfd_put(sock); + xsk_map_node_free(node); + return err; } static int xsk_map_delete_elem(struct bpf_map *map, void *key) -- 2.20.1
Powered by blists - more mailing lists