mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-11 08:54:28 -05:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From 9e8bdd63f7011dff5523ea435433834b3702398d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
|
||
|
|
Date: Mon, 22 Feb 2016 16:30:40 -0700
|
||
|
|
Subject: net: ipc_router: Bind only a client port as control port
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
CRs-Fixed: 974577
|
||
|
|
Change-Id: I9f189b76967d5f85750218a7cb6537d187a69663
|
||
|
|
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
|
||
|
|
---
|
||
|
|
net/ipc_router/ipc_router_core.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/ipc_router/ipc_router_core.c b/net/ipc_router/ipc_router_core.c
|
||
|
|
index 99486e9..3100ebd 100644
|
||
|
|
--- a/net/ipc_router/ipc_router_core.c
|
||
|
|
+++ b/net/ipc_router/ipc_router_core.c
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* Copyright (c) 2011-2015, 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
|
||
|
|
@@ -3532,7 +3532,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_lhc2);
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|