diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-10-07 05:36:33 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-10-07 05:36:33 +0000 |
| commit | 1cdf74723ffdc7c4560f637bce3328f2505fbe09 (patch) | |
| tree | 90812520e31cf4a879d2410bb6647cea221ba75c | |
| parent | 414aa922322d813a2c182e7a95add221db99a69b (diff) | |
| parent | 54a762bb82cd1df8b15a8651638996f0015021a6 (diff) | |
| download | mediatek-1cdf74723ffdc7c4560f637bce3328f2505fbe09.tar.gz | |
Merge "ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct" into android-mediatek-pike-3.10
| -rw-r--r-- | drivers/android/binder.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 1522affbd8c9..c3e5e71793ac 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -1584,7 +1584,9 @@ static void binder_transaction(struct binder_proc *proc, fp->type = BINDER_TYPE_HANDLE; else fp->type = BINDER_TYPE_WEAK_HANDLE; + fp->binder = 0; fp->handle = ref->desc; + fp->cookie = 0; binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE, &thread->todo); @@ -1631,7 +1633,9 @@ static void binder_transaction(struct binder_proc *proc, return_error = BR_FAILED_REPLY; goto err_binder_get_ref_for_node_failed; } + fp->binder = 0; fp->handle = new_ref->desc; + fp->cookie = 0; binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL); trace_binder_transaction_ref_to_ref(t, ref, new_ref); @@ -1683,6 +1687,7 @@ static void binder_transaction(struct binder_proc *proc, binder_debug(BINDER_DEBUG_TRANSACTION, " fd %d -> %d\n", fp->handle, target_fd); /* TODO: fput? */ + fp->binder = 0; fp->handle = target_fd; } break; |