Skip to content

fixing a possibly merge mishap happened on binder #6

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

Open
Kethen wants to merge 1 commit into
base: lineage-19.1
Choose a base branch
from
+5 −2
Open

fixing a possibly merge mishap happened on binder #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions drivers/staging/android/binder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2907,17 +2907,20 @@ static void binder_transaction(struct binder_proc *proc,
target_node = context->binder_context_mgr_node;
if (target_node == NULL) {

return_error = BR_DEAD_REPLY;
mutex_unlock(&context->context_mgr_node_lock);
return_error = BR_DEAD_REPLY;
return_error_line = __LINE__;
goto err_dead_binder;
}
if (target_node && target_proc == proc) {
binder_user_error("%d:%d got transaction to context manager from process owning it\n",
proc->pid, thread->pid);
mutex_unlock(&context->context_mgr_node_lock);
return_error = BR_FAILED_REPLY;
return_error_param = -EINVAL;
return_error_line = __LINE__;
goto err_invalid_target_handle;
}
}
binder_inc_node(target_node, 1, 0, NULL);
mutex_unlock(&context->context_mgr_node_lock);
}
Expand Down