libbpf: Fix negative FD close() in xsk_setup_xdp_prog()
authorAndrii Nakryiko <andriin@fb.com>
Thu, 7 Nov 2019 05:40:59 +0000 (21:40 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:45:05 +0000 (16:45 +0100)
commitfe3a9c40723235f1c649a1c161011e57a785689d
tree0c514ec6941591de3f39a83c4fa7b0b426ec917a
parent72e7909be5f927f374527382f0334c7e53d2ba69
libbpf: Fix negative FD close() in xsk_setup_xdp_prog()

[ Upstream commit 9656b346b280c3e49c8a116c3a715f966633b161 ]

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: 10a13bb40e54 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/xsk.c