Skip to content

binder: Avoid potential deadlock when canceling AsyncSecurityPolicy futures #12283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 14, 2025
Merged

binder: Avoid potential deadlock when canceling AsyncSecurityPolicy futures #12283

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c54cfff
binder: Avoid potential deadlock when canceling AsyncSecurityPolicy f…
HyunSangHan Aug 16, 2025
9111970
Merge branch 'master' of https://github.com/HyunSangHan/grpc-java int…
HyunSangHan Aug 24, 2025
7138614
binder: Fix potential deadlock in BinderClientTransport.notifyTermina…
HyunSangHan Aug 24, 2025
4d7ed66
binder: Extract cancelAsync method with isDone optimization
HyunSangHan Aug 27, 2025
fc77da4
binder: Rename method, relocate calls, and remove null assignments
HyunSangHan Sep 2, 2025
1c3a0ea
binder: Use register() pattern to cancel futures safely without holdi…
HyunSangHan Oct 8, 2025
0af3f85
Merge branch 'master' of https://github.com/HyunSangHan/grpc-java int…
HyunSangHan Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions binder/src/main/java/io/grpc/binder/internal/BinderClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,9 @@ void notifyTerminated() {
readyTimeoutFuture.cancel(false);
readyTimeoutFuture = null;
}
if (preAuthResultFuture != null) {
preAuthResultFuture.cancel(false); // No effect if already complete.
}
if (authResultFuture != null) {
authResultFuture.cancel(false); // No effect if already complete.
}
cancelAsyncIfNeeded(preAuthResultFuture);
cancelAsyncIfNeeded(authResultFuture);

serviceBinding.unbind();
clientTransportListener.transportTerminated();
}
Expand Down Expand Up @@ -399,6 +396,17 @@ protected void handlePingResponse(Parcel parcel) {
pingTracker.onPingResponse(parcel.readInt());
}

/**
* Enqueues a future for cancellation later, on another thread.
* Useful when the caller wants to cancel while holding locks but the future is visible to
* user code which might have added listeners to run on directExecutor().
*/
private void cancelAsyncIfNeeded(@Nullable ListenableFuture<?> future) {
if (future != null && !future.isDone()) {
offloadExecutor.execute(() -> future.cancel(false));
}
}

private static ClientStream newFailingClientStream(
Status failure, Attributes attributes, Metadata headers, ClientStreamTracer[] tracers) {
StatsTraceContext statsTraceContext =
Expand Down