diff options
| author | Magnus Karlsson <magnus.karlsson@intel.com> | 2020-11-03 10:41:29 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-11-04 21:37:28 +0100 |
| commit | f78331f74cacb33d87cd60376dacc5bd397959e2 (patch) | |
| tree | 090786d3bda73e455f781d0692a5e565346150ba /tools | |
| parent | 7a078d2d18801bba7bde7337a823d7342299acf7 (diff) | |
| download | linux-stable-f78331f74cacb33d87cd60376dacc5bd397959e2.tar.gz linux-stable-f78331f74cacb33d87cd60376dacc5bd397959e2.tar.bz2 linux-stable-f78331f74cacb33d87cd60376dacc5bd397959e2.zip | |
libbpf: Fix null dereference in xsk_socket__delete
Fix a possible null pointer dereference in xsk_socket__delete that
will occur if a null pointer is fed into the function.
Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices")
Reported-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1604396490-12129-2-git-send-email-magnus.karlsson@gmail.com
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/bpf/xsk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index e3c98c007825..504b7a85d445 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -891,13 +891,14 @@ int xsk_umem__delete(struct xsk_umem *umem) void xsk_socket__delete(struct xsk_socket *xsk) { size_t desc_sz = sizeof(struct xdp_desc); - struct xsk_ctx *ctx = xsk->ctx; struct xdp_mmap_offsets off; + struct xsk_ctx *ctx; int err; if (!xsk) return; + ctx = xsk->ctx; if (ctx->prog_fd != -1) { xsk_delete_bpf_maps(xsk); close(ctx->prog_fd); |