| Message ID | 20220901202645.1463552-1-irogers@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af515a5587b8f45f19e11657746e0c89411b0380 |
| Delegated to: | BPF |
| Headers | show |
| Series | [v1] selftests/xsk: Avoid use-after-free on ctx | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
| bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for build for s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-7 | success | Logs for test_maps on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-8 | success | Logs for test_maps on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-10 | success | Logs for test_progs on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-13 | success | Logs for test_progs_no_alu32 on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-16 | success | Logs for test_verifier on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-17 | success | Logs for test_verifier on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-14 | success | Logs for test_progs_no_alu32 on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-11 | success | Logs for test_progs on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-6 | success | Logs for test_maps on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-15 | success | Logs for test_verifier on s390x with gcc |
| bpf/vmtest-bpf-next-PR | success | PR summary |
| bpf/vmtest-bpf-next-VM_Test-9 | success | Logs for test_progs on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-12 | success | Logs for test_progs_no_alu32 on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for build for x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-3 | success | Logs for build for x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-4 | success | Logs for llvm-toolchain |
| bpf/vmtest-bpf-next-VM_Test-5 | success | Logs for set-matrix |
On Thu, Sep 1, 2022 at 10:56 PM Ian Rogers <irogers@google.com> wrote: > > 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. Thanks for spotting and fixing this Ian. Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> > Fixes: 39e940d4abfa ("selftests/xsk: Destroy BPF resources only when ctx refcount drops to 0") > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/testing/selftests/bpf/xsk.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/bpf/xsk.c b/tools/testing/selftests/bpf/xsk.c > index f2721a4ae7c5..0b3ff49c740d 100644 > --- a/tools/testing/selftests/bpf/xsk.c > +++ b/tools/testing/selftests/bpf/xsk.c > @@ -1237,15 +1237,15 @@ void xsk_socket__delete(struct xsk_socket *xsk) > ctx = xsk->ctx; > umem = ctx->umem; > > - xsk_put_ctx(ctx, true); > - > - if (!ctx->refcount) { > + if (ctx->refcount == 1) { > xsk_delete_bpf_maps(xsk); > close(ctx->prog_fd); > if (ctx->has_bpf_link) > close(ctx->link_fd); > } > > + xsk_put_ctx(ctx, true); > + > err = xsk_get_mmap_offsets(xsk->fd, &off); > if (!err) { > if (xsk->rx) { > -- > 2.37.2.789.g6183377224-goog >
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Thu, 1 Sep 2022 13:26:45 -0700 you wrote: > 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: 39e940d4abfa ("selftests/xsk: Destroy BPF resources only when ctx refcount drops to 0") > Signed-off-by: Ian Rogers <irogers@google.com> > > [...] Here is the summary with links: - [v1] selftests/xsk: Avoid use-after-free on ctx https://git.kernel.org/bpf/bpf-next/c/af515a5587b8 You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/xsk.c b/tools/testing/selftests/bpf/xsk.c index f2721a4ae7c5..0b3ff49c740d 100644 --- a/tools/testing/selftests/bpf/xsk.c +++ b/tools/testing/selftests/bpf/xsk.c @@ -1237,15 +1237,15 @@ void xsk_socket__delete(struct xsk_socket *xsk) ctx = xsk->ctx; umem = ctx->umem; - xsk_put_ctx(ctx, true); - - if (!ctx->refcount) { + if (ctx->refcount == 1) { xsk_delete_bpf_maps(xsk); close(ctx->prog_fd); if (ctx->has_bpf_link) close(ctx->link_fd); } + xsk_put_ctx(ctx, true); + err = xsk_get_mmap_offsets(xsk->fd, &off); if (!err) { if (xsk->rx) {
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: 39e940d4abfa ("selftests/xsk: Destroy BPF resources only when ctx refcount drops to 0") Signed-off-by: Ian Rogers <irogers@google.com> --- tools/testing/selftests/bpf/xsk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)