diff options
| author | Karthikeyan Ramasubramanian <kramasub@codeaurora.org> | 2016-02-22 16:30:40 -0700 |
|---|---|---|
| committer | Mekala Natarajan <mnatarajan@google.com> | 2016-08-08 16:10:30 -0700 |
| commit | 3d4b4ed1fe0d195e9f0c8d6c9dcdda0de8cbc723 (patch) | |
| tree | 24dedbfccb1ef61cd7518b30c53ecbb478f1461c | |
| parent | 633b6d258fdad07b686f035f0217684ba91efc51 (diff) | |
net: ipc_router: Bind only a client port as control portandroid-6.0.1_r0.120
IPC Router binds any port as a control port and moves it from the client
port list to control port list. Misbehaving clients can exploit this
incorrect behavior.
IPC Router to check if the port is a client port before binding it as a
control port.
Bug: 27045580
CRs-Fixed: 974577
Change-Id: I9f189b76967d5f85750218a7cb6537d187a69663
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Signed-off-by: Mekala Natarajan <mnatarajan@google.com>
| -rw-r--r-- | net/ipc_router/ipc_router_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipc_router/ipc_router_core.c b/net/ipc_router/ipc_router_core.c index 2ca09ffa3321..38ef61fff1d1 100644 --- a/net/ipc_router/ipc_router_core.c +++ b/net/ipc_router/ipc_router_core.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -2967,7 +2967,7 @@ int msm_ipc_router_get_curr_pkt_size(struct msm_ipc_port *port_ptr) int msm_ipc_router_bind_control_port(struct msm_ipc_port *port_ptr) { - if (!port_ptr) + if (unlikely(!port_ptr || port_ptr->type != CLIENT_PORT)) return -EINVAL; down_write(&local_ports_lock_lha2); |