|
 |
43fe83 |
From d7661c0cf4ed8d2fbb974659a329e52b28b5e178 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <d7661c0cf4ed8d2fbb974659a329e52b28b5e178.1377873640.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
43fe83 |
Date: Fri, 30 Aug 2013 11:16:11 +0100
|
|
|
43fe83 |
Subject: [PATCH] Add bounds checking on virConnectListAllNodeDevices RPC call
|
|
|
43fe83 |
|
|
|
43fe83 |
For
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1002667
|
|
|
43fe83 |
|
|
|
43fe83 |
The return values for the virConnectListAllNodeDevices call were not
|
|
|
43fe83 |
bounds checked. This is a robustness issue for clients if
|
|
|
43fe83 |
something where to cause corruption of the RPC stream data.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit 1dcff6a7ea668feeeec55ee577e5182a1c0082e4)
|
|
|
43fe83 |
---
|
|
|
43fe83 |
daemon/remote.c | 7 +++++++
|
|
|
43fe83 |
src/remote/remote_driver.c | 7 +++++++
|
|
|
43fe83 |
src/remote/remote_protocol.x | 8 ++++----
|
|
|
43fe83 |
3 files changed, 18 insertions(+), 4 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/daemon/remote.c b/daemon/remote.c
|
|
|
43fe83 |
index 871b0df..697aa58 100644
|
|
|
43fe83 |
--- a/daemon/remote.c
|
|
|
43fe83 |
+++ b/daemon/remote.c
|
|
|
43fe83 |
@@ -4315,6 +4315,13 @@ remoteDispatchConnectListAllNodeDevices(virNetServerPtr server ATTRIBUTE_UNUSED,
|
|
|
43fe83 |
args->flags)) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (ndevices > REMOTE_NODE_DEVICE_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many node devices '%d' for limit '%d'"),
|
|
|
43fe83 |
+ ndevices, REMOTE_NODE_DEVICE_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (devices && ndevices) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(ret->devices.devices_val, ndevices) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
|
|
|
43fe83 |
index 4d82452..b170a06 100644
|
|
|
43fe83 |
--- a/src/remote/remote_driver.c
|
|
|
43fe83 |
+++ b/src/remote/remote_driver.c
|
|
|
43fe83 |
@@ -2975,6 +2975,13 @@ remoteConnectListAllNodeDevices(virConnectPtr conn,
|
|
|
43fe83 |
(char *) &ret) == -1)
|
|
|
43fe83 |
goto done;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (ret.devices.devices_len > REMOTE_NODE_DEVICE_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many node devices '%d' for limit '%d'"),
|
|
|
43fe83 |
+ ret.devices.devices_len, REMOTE_NODE_DEVICE_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (devices) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(tmp_devices, ret.devices.devices_len + 1) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
|
|
|
43fe83 |
index 573d63f..21059c8 100644
|
|
|
43fe83 |
--- a/src/remote/remote_protocol.x
|
|
|
43fe83 |
+++ b/src/remote/remote_protocol.x
|
|
|
43fe83 |
@@ -100,8 +100,8 @@ const REMOTE_STORAGE_POOL_LIST_MAX = 4096;
|
|
|
43fe83 |
/* Upper limit on lists of storage vols. */
|
|
|
43fe83 |
const REMOTE_STORAGE_VOL_LIST_MAX = 16384;
|
|
|
43fe83 |
|
|
|
43fe83 |
-/* Upper limit on lists of node device names. */
|
|
|
43fe83 |
-const REMOTE_NODE_DEVICE_NAME_LIST_MAX = 16384;
|
|
|
43fe83 |
+/* Upper limit on lists of node devices. */
|
|
|
43fe83 |
+const REMOTE_NODE_DEVICE_LIST_MAX = 16384;
|
|
|
43fe83 |
|
|
|
43fe83 |
/* Upper limit on lists of node device capabilities. */
|
|
|
43fe83 |
const REMOTE_NODE_DEVICE_CAPS_LIST_MAX = 65536;
|
|
|
43fe83 |
@@ -1863,7 +1863,7 @@ struct remote_node_list_devices_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_node_list_devices_ret {
|
|
|
43fe83 |
- remote_nonnull_string names<REMOTE_NODE_DEVICE_NAME_LIST_MAX>; /* insert@2 */
|
|
|
43fe83 |
+ remote_nonnull_string names<REMOTE_NODE_DEVICE_LIST_MAX>; /* insert@2 */
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_node_device_lookup_by_name_args {
|
|
|
43fe83 |
@@ -2708,7 +2708,7 @@ struct remote_connect_list_all_node_devices_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_connect_list_all_node_devices_ret {
|
|
|
43fe83 |
- remote_nonnull_node_device devices<>;
|
|
|
43fe83 |
+ remote_nonnull_node_device devices<REMOTE_NODE_DEVICE_LIST_MAX>;
|
|
|
43fe83 |
unsigned int ret;
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|