1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 38a59a630cd4..dc1c83eafc22 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2988,7 +2988,7 @@ static void binder_transaction(struct binder_proc *proc,
                         else
                                 return_error = BR_DEAD_REPLY;
                         mutex_unlock(&context->context_mgr_node_lock);
-                        if (target_node && target_proc == proc) {
+                        if (target_node && target_proc->pid == proc->pid) {
                                 binder_user_error("%d:%d got transaction to context manager from process owning it\n",
                                                   proc->pid, thread->pid);
                                 return_error = BR_FAILED_REPLY;
@@ -3239,7 +3239,8 @@ static void binder_transaction(struct binder_proc *proc,
         buffer_offset = off_start_offset;
         off_end_offset = off_start_offset + tr->offsets_size;
         sg_buf_offset = ALIGN(off_end_offset, sizeof(void *));
-        sg_buf_end_offset = sg_buf_offset + extra_buffers_size;
+        sg_buf_end_offset = sg_buf_offset + extra_buffers_size -
+                ALIGN(secctx_sz, sizeof(u64));
         off_min = 0;
         for (buffer_offset = off_start_offset; buffer_offset < off_end_offset;
              buffer_offset += sizeof(binder_size_t)) {