mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/xsk: Avoid use-after-free on ctx

Browse Source 
[ Upstream commit af515a5587 ]

The put lowers the reference count to 0 and frees ctx, reading it
afterwards is invalid. Move the put after the uses and determine the
last use by the reference count being 1.

Fixes: 39e940d4ab ("selftests/xsk: Destroy BPF resources only when ctx refcount drops to 0")
Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20220901202645.1463552-1-irogers@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ian Rogers
2022-09-01 13:26:45 -07:00
committed by Greg Kroah-Hartman
parent c823df0679
commit 5576008305
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/lib/bpf/xsk.c
View File

@@ -930,13 +930,13 @@ void xsk_socket__delete(struct xsk_socket *xsk)
ctx = xsk->ctx; ctx = xsk->ctx;
umem = ctx->umem; umem = ctx->umem;
xsk_put_ctx(ctx, true); if (ctx->refcount == 1) {
if (!ctx->refcount) {
xsk_delete_bpf_maps(xsk); xsk_delete_bpf_maps(xsk);
close(ctx->prog_fd); close(ctx->prog_fd);
} }
xsk_put_ctx(ctx, true);
err = xsk_get_mmap_offsets(xsk->fd, &off); err = xsk_get_mmap_offsets(xsk->fd, &off);
if (!err) { if (!err) {
if (xsk->rx) { if (xsk->rx) {