aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋金时 <songjinshi@xiaomi.com>2018-05-10 02:05:03 +0000
committerMartijn Coenen <maco@android.com>2018-07-17 11:14:22 +0200
commite1b1a8be1d974793876bd9ce7a03d86ee4333cc7 (patch)
treef61a60ad9e5d896dd5d93c1b9c03c8c5213b02e2
parent61a775a14bd860aa6ef226284ae9affb785a4628 (diff)
downloadlinux-linaro-stable-e1b1a8be1d974793876bd9ce7a03d86ee4333cc7.tar.gz
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
-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 6121d012ce68..2ed6f33d5254 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4093,6 +4093,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);