summaryrefslogtreecommitdiff
path: root/drivers/android
diff options
context:
space:
mode:
author宋金时 <songjinshi@xiaomi.com>2018-05-10 02:05:03 +0000
committerAmit Pundir <amit.pundir@linaro.org>2018-07-19 22:01:35 +0530
commit6f96c11abbc65974c90df78906c71d829760ff42 (patch)
treee50e2f1a0b0166743587680919ccbc35f694ef3c /drivers/android
parent9ffd98e8155c716ae987491626544be016edd83c (diff)
UPSTREAM: ANDROID: binder: correct the cmd print for BINDER_WORK_RETURN_ERROR
When to execute binder_stat_br the e->cmd has been modifying as BR_OK instead of the original return error cmd, in fact we want to know the original return error, such as BR_DEAD_REPLY or BR_FAILED_REPLY, etc. instead of always BR_OK, in order to avoid the value of the e->cmd is always BR_OK, so we need assign the value of the e->cmd to cmd before e->cmd = BR_OK. Signed-off-by: songjinshi <songjinshi@xiaomi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 838d5565669aa5bb7deb605684a5970d51d5eaf6) Change-Id: I425b32c5419a491c6b9ceee7c00dde6513e0421d
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index d4fb60022d60..8d303b672e0e 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4094,6 +4094,7 @@ retry:
binder_inner_proc_unlock(proc);
if (put_user(e->cmd, (uint32_t __user *)ptr))
return -EFAULT;
+ cmd = e->cmd;
e->cmd = BR_OK;
ptr += sizeof(uint32_t);