2014-01-12 22:22:18

by Andrzej Kaczmarek

Subject: [PATCH] android/ipc: Use proper handlers in ipc_handle_msg

ipc_handle_msg() should use handlers passed as function parameter
instead of static one as otherwise Audio IPC will use incorrect
handlers.
---
android/ipc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/ipc.c b/android/ipc.c
index a31d315..ed3ef3c 100644
--- a/android/ipc.c
+++ b/android/ipc.c
@@ -82,7 +82,7 @@ int ipc_handle_msg(struct service_handler *handlers, size_t max_index,
}

/* opcode is table offset + 1 */
- handler = &services[msg->service_id].handler[msg->opcode - 1];
+ handler = &handlers[msg->service_id].handler[msg->opcode - 1];

/* if payload size is valid */
if ((handler->var_len && handler->data_len > msg->len) ||
--
1.8.5.2

2014-01-13 08:11:56

by Szymon Janc

Subject: Re: [PATCH] android/ipc: Use proper handlers in ipc_handle_msg

Hi Andrzej,

On Sunday 12 of January 2014 23:22:18 Andrzej Kaczmarek wrote:
> ipc_handle_msg() should use handlers passed as function parameter
> instead of static one as otherwise Audio IPC will use incorrect
> handlers.
> ---
> android/ipc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/ipc.c b/android/ipc.c
> index a31d315..ed3ef3c 100644
> --- a/android/ipc.c
> +++ b/android/ipc.c
> @@ -82,7 +82,7 @@ int ipc_handle_msg(struct service_handler *handlers, size_t max_index,
> }
>
> /* opcode is table offset + 1 */
> - handler = &services[msg->service_id].handler[msg->opcode - 1];
> + handler = &handlers[msg->service_id].handler[msg->opcode - 1];
>
> /* if payload size is valid */
> if ((handler->var_len && handler->data_len > msg->len) ||
>

Applied, thanks.

--
Best regards,
Szymon Janc