From: Hui Peng <benquike@gmail.com>
To: gregkh@linuxfoundation.org, arve@android.com, tkjos@android.com,
brauner@kernel.org, cmllamas@google.com, aliceryhl@google.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] binder: roll back frozen state and enqueue freeze work on BINDER_FREEZE error
Date: Sat, 19 Sep 2026 21:36:52 +0000 [thread overview]
Message-ID: <20260919213652.3317208-1-benquike@gmail.com> (raw)
Fix two state rollback bugs when `BINDER_FREEZE` fails with `-EAGAIN`:
1. In `binder_ioctl_freeze()`, `target_proc->is_frozen = true` is set
before waiting for pending transactions to drain. If
`wait_event_interruptible_timeout()` times out with `-EAGAIN`,
`binder_ioctl_freeze()` resets `target_proc->is_frozen = false` but
omits calling `binder_add_freeze_work(target_proc, false)`, leaving
any `BINDER_WORK_FROZEN_INFO` state queued during the freeze window
un-cleared.
2. In `binder_ioctl()` (`BINDER_FREEZE`), a single PID can own multiple
`binder_proc` instances (`target_procs[]`). If
`binder_ioctl_freeze()` succeeds on `target_procs[0]` (`is_frozen =
true`) and then fails with `-EAGAIN` on `target_procs[1]`, the loop
exits and returns `-EAGAIN` to userspace while leaving
`target_procs[0]` permanently frozen. Unfreeze any previously frozen
`target_procs[0..i-1]` when `binder_ioctl_freeze()` fails.
Fixes: 432ff1e91694 ("binder: BINDER_FREEZE ioctl")
Fixes: d579b04a52a1 ("binder: frozen notification")
Assisted-by: LLM
Signed-off-by: Hui Peng <benquike@gmail.com>
---
drivers/android/binder.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 8f2ef1bd539f..1c7218e599a1 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -5732,6 +5756,7 @@ static int binder_ioctl_freeze(struct binder_freeze_info *info,
binder_inner_proc_lock(target_proc);
target_proc->is_frozen = false;
binder_inner_proc_unlock(target_proc);
+ binder_add_freeze_work(target_proc, false);
} else {
binder_add_freeze_work(target_proc, true);
}
@@ -5939,9 +5964,19 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
mutex_unlock(&binder_procs_lock);
for (i = 0; i < target_procs_count; i++) {
- if (ret >= 0)
+ if (ret >= 0) {
ret = binder_ioctl_freeze(&info,
target_procs[i]);
+ if (ret < 0 && info.enable) {
+ struct binder_freeze_info unfreeze = info;
+ int j;
+
+ unfreeze.enable = 0;
+ for (j = 0; j < i; j++)
+ binder_ioctl_freeze(&unfreeze,
+ target_procs[j]);
+ }
+ }
binder_proc_dec_tmpref(target_procs[i]);
}
reply other threads:[~2026-09-19 21:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260919213652.3317208-1-benquike@gmail.com \
--to=benquike@gmail.com \
--cc=aliceryhl@google.com \
--cc=arve@android.com \
--cc=brauner@kernel.org \
--cc=cmllamas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tkjos@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®