binder: fix incorrect cmd to binder_stat_br
authorTodd Kjos <tkjos@android.com>
Tue, 8 Aug 2017 22:48:36 +0000 (15:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Aug 2017 01:48:22 +0000 (18:48 -0700)
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 b366dc9e8217778104b8c562bb187c2855cb33e5..947eb7056fa7e6efff763b17f2df04155ca0b327 100644 (file)
@@ -3619,7 +3619,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);