OSDN Git Service

binder: fix incorrect cmd to binder_stat_br
authorTodd Kjos <tkjos@android.com>
Tue, 8 Aug 2017 22:48:36 +0000 (15:48 -0700)
committer0ranko0P <ranko0p@outlook.com>
Sat, 7 Dec 2019 10:22:19 +0000 (18:22 +0800)
commit 26549d177410 ("binder: guarantee txn complete / errors delivered
in-order") passed the locally declared and undefined cmd
to binder_stat_br() which results in a bogus cmd field in a trace
event and BR stats are incremented incorrectly.

Change to use e->cmd which has been initialized.

Signed-off-by: Todd Kjos <tkjos@google.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 26549d177410 ("binder: guarantee txn complete / errors delivered in-order")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/android/binder.c

index c6343c3..acefb7c 100644 (file)
@@ -4170,7 +4170,7 @@ retry:
                        e->cmd = BR_OK;
                        ptr += sizeof(uint32_t);
 
-                       binder_stat_br(proc, thread, cmd);
+                       binder_stat_br(proc, thread, e->cmd);
                } break;
                case BINDER_WORK_TRANSACTION_COMPLETE: {
                        binder_inner_proc_unlock(proc);