Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b1a8be authored by 宋金时's avatar 宋金时 Committed by Martijn Coenen
Browse files

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: default avatarsongjinshi <songjinshi@xiaomi.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 838d5565669aa5bb7deb605684a5970d51d5eaf6)

Change-Id: I425b32c5419a491c6b9ceee7c00dde6513e0421d
parent 61a775a1

drivers/android/binder.c

+1 −0
Original line number Diff line number Diff line
@@ -4093,6 +4093,7 @@ static int binder_thread_read(struct binder_proc *proc, 
			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);