Commit 64165ddf authored by Mehrdad Arshad Rad's avatar Mehrdad Arshad Rad Committed by Daniel Borkmann
Browse files

libbpf: Fix lookup_and_delete_elem_flags error reporting 



Fix bpf_map_lookup_and_delete_elem_flags() to pass the return code through
libbpf_err_errno() as we do similarly in bpf_map_lookup_and_delete_elem().

Fixes: f12b6543 ("libbpf: Streamline error reporting for low-level APIs")
Signed-off-by: default avatarMehrdad Arshad Rad <arshad.rad@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20211104171354.11072-1-arshad.rad@gmail.com
parent e41ac202

tools/lib/bpf/bpf.c

+3 −1
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value) 
int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, __u64 flags)

{

	union bpf_attr attr;

	int ret;



	memset(&attr, 0, sizeof(attr));

	attr.map_fd = fd;
@@ -522,7 +523,8 @@ int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, _ 
	attr.value = ptr_to_u64(value);

	attr.flags = flags;



	return sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_delete_elem(int fd, const void *key)