Commit 9656b346 authored Nov 06, 2019 by Andrii Nakryiko Committed by Daniel Borkmann Nov 07, 2019

libbpf: Fix negative FD close() in xsk_setup_xdp_prog()

Fix issue reported by static analysis (Coverity). If bpf_prog_get_fd_by_id()
fails, xsk_lookup_bpf_maps() will fail as well and clean-up code will attempt
close() with fd=-1. Fix by checking bpf_prog_get_fd_by_id() return result and
exiting early.

Fixes: 10a13bb4 ("libbpf: remove qidconf and better support external bpf programs.")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20191107054059.313884-1-andriin@fb.com

parent dab2e9eb

tools/lib/bpf/xsk.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,8 @@ static int xsk_setup_xdp_prog(struct xsk_socket *xsk)
		}
		} else {
		xsk->prog_fd = bpf_prog_get_fd_by_id(prog_id);
		if (xsk->prog_fd < 0)
		return -errno;
		err = xsk_lookup_bpf_maps(xsk);
		if (err) {
		close(xsk->prog_fd);