|
 |
43fe83 |
From 6a7837f5eaf8dd9c6cf0b4319a0ae0ee747d3227 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <6a7837f5eaf8dd9c6cf0b4319a0ae0ee747d3227.1377873640.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
43fe83 |
Date: Fri, 30 Aug 2013 11:16:08 +0100
|
|
|
43fe83 |
Subject: [PATCH] Add bounds checking on virStoragePoolListAllVolumes RPC call
|
|
|
43fe83 |
|
|
|
43fe83 |
For
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1002667
|
|
|
43fe83 |
|
|
|
43fe83 |
The return values for the virStoragePoolListAllVolumes 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 046acaf37bc95d895f0a7d04a3a06ac992701711)
|
|
|
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 42c1c47..512170b 100644
|
|
|
43fe83 |
--- a/daemon/remote.c
|
|
|
43fe83 |
+++ b/daemon/remote.c
|
|
|
43fe83 |
@@ -4136,6 +4136,13 @@ remoteDispatchStoragePoolListAllVolumes(virNetServerPtr server ATTRIBUTE_UNUSED,
|
|
|
43fe83 |
args->flags)) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (nvols > REMOTE_STORAGE_VOL_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many storage volumes '%d' for limit '%d'"),
|
|
|
43fe83 |
+ nvols, REMOTE_STORAGE_VOL_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (vols && nvols) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(ret->vols.vols_val, nvols) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
|
|
|
43fe83 |
index 622647b..542cb39 100644
|
|
|
43fe83 |
--- a/src/remote/remote_driver.c
|
|
|
43fe83 |
+++ b/src/remote/remote_driver.c
|
|
|
43fe83 |
@@ -3343,6 +3343,13 @@ remoteStoragePoolListAllVolumes(virStoragePoolPtr pool,
|
|
|
43fe83 |
(char *) &ret) == -1)
|
|
|
43fe83 |
goto done;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (ret.vols.vols_len > REMOTE_STORAGE_VOL_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many storage volumes '%d' for limit '%d'"),
|
|
|
43fe83 |
+ ret.vols.vols_len, REMOTE_STORAGE_VOL_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (vols) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(tmp_vols, ret.vols.vols_len + 1) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
|
|
|
43fe83 |
index 6e996b4..2034aa1 100644
|
|
|
43fe83 |
--- a/src/remote/remote_protocol.x
|
|
|
43fe83 |
+++ b/src/remote/remote_protocol.x
|
|
|
43fe83 |
@@ -100,8 +100,8 @@ const REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX = 16384;
|
|
|
43fe83 |
/* Upper limit on lists of storage pools. */
|
|
|
43fe83 |
const REMOTE_STORAGE_POOL_LIST_MAX = 4096;
|
|
|
43fe83 |
|
|
|
43fe83 |
-/* Upper limit on lists of storage vol names. */
|
|
|
43fe83 |
-const REMOTE_STORAGE_VOL_NAME_LIST_MAX = 16384;
|
|
|
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 |
@@ -1746,7 +1746,7 @@ struct remote_storage_pool_list_volumes_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_storage_pool_list_volumes_ret {
|
|
|
43fe83 |
- remote_nonnull_string names<REMOTE_STORAGE_VOL_NAME_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
+ remote_nonnull_string names<REMOTE_STORAGE_VOL_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -2681,7 +2681,7 @@ struct remote_storage_pool_list_all_volumes_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_storage_pool_list_all_volumes_ret {
|
|
|
43fe83 |
- remote_nonnull_storage_vol vols<>;
|
|
|
43fe83 |
+ remote_nonnull_storage_vol vols<REMOTE_STORAGE_VOL_LIST_MAX>;
|
|
|
43fe83 |
unsigned int ret;
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|