summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCiara Loftus <ciara.loftus@intel.com>2021-03-31 06:12:16 +0000
committerAlexei Starovoitov <ast@kernel.org>2021-04-01 14:45:43 -0700
commitdf662016310aa4475d7986fd726af45c8fe4f362 (patch)
tree7a4f2277ac3652140ed729fb215854dcecbd8fa9 /tools
parentd37300ed182131f1757895a62e556332857417e5 (diff)
libbpf: Ensure umem pointer is non-NULL before dereferencing
Calls to xsk_socket__create dereference the umem to access the fill_save and comp_save pointers. Make sure the umem is non-NULL before doing this. Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices") Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> Link: https://lore.kernel.org/bpf/20210331061218.1647-2-ciara.loftus@intel.com
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/bpf/xsk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 526fc35c0b23..443b0cfb45e8 100644
--- a/tools/lib/bpf/xsk.c
+++ b/tools/lib/bpf/xsk.c
@@ -1019,6 +1019,9 @@ int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname,
struct xsk_ring_cons *rx, struct xsk_ring_prod *tx,
const struct xsk_socket_config *usr_config)
{
+ if (!umem)
+ return -EFAULT;
+
return xsk_socket__create_shared(xsk_ptr, ifname, queue_id, umem,
rx, tx, umem->fill_save,
umem->comp_save, usr_config);