çå: [PATCH] ANDROID: binder: correct the cmd print for BINDER_WORK_RETURN_ERROR

From: åéæ
Date: Wed May 09 2018 - 22:41:47 EST


OKïthis patch is based on the downstream android kernel4.4 version, not yet include the latest changes, let me update the patch to base on the latest upstream, Tks.

________________________________________
åää: Todd Kjos <tkjos@xxxxxxxxxx>
åéæé: 2018å5æ10æ 2:08
æää: åéæ
æé: Greg Kroah-Hartman; Martijn Coenen; Arve HjÃnnevÃg; LKML
äé: Re: [PATCH] ANDROID: binder: correct the cmd print for BINDER_WORK_RETURN_ERROR

On Wed, May 9, 2018 at 12:31 AM åéæ <songjinshi@xxxxxxxxxx> wrote:

> In case of the BINDER_WORK_RETURN_ERROR the cmd is no assignment,
> so it's value will be old value or dirty value, before modifying
> e->cmd, assign the value of the e->cmd to cmd to ensure the correct
> print of binder_stat_br.


That's not the problem... the problem is that e->cmd is unconditionally set
to BR_OK prior to the call to binder_stat_br(proc, thread, e->cmd) so the
reported cmd is always BR_OK.


> Signed-off-by: songjinshi <songjinshi@xxxxxxxxxx>
> ---

> diff --git a/drivers/android/binder.c b/drivers/android/binder.c
> index 4ffc84d..acd7d44a 100644
> --- a/drivers/android/binder.c
> +++ b/drivers/android/binder.c
> @@ -4086,6 +4086,7 @@
> struct binder_error *e = container_of(
> w, struct binder_error, work);

> + cmd = e->cmd;
> WARN_ON(e->cmd == BR_OK);
> binder_inner_proc_unlock(proc);
> if (put_user(e->cmd, (uint32_t __user *)ptr))


Don't you also need to use cmd in the call to binder_state_br() below?

- binder_stat_br(proc, thread, e->cmd);
+ binder_stat_br(proc, thread, cmd);

-Todd