From 6a7837f5eaf8dd9c6cf0b4319a0ae0ee747d3227 Mon Sep 17 00:00:00 2001
Message-Id: <6a7837f5eaf8dd9c6cf0b4319a0ae0ee747d3227.1377873640.git.jdenemar@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 30 Aug 2013 11:16:08 +0100
Subject: [PATCH] Add bounds checking on virStoragePoolListAllVolumes RPC call

For

  https://bugzilla.redhat.com/show_bug.cgi?id=1002667

The return values for the virStoragePoolListAllVolumes call were not
bounds checked. This is a robustness issue for clients if
something where to cause corruption of the RPC stream data.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 046acaf37bc95d895f0a7d04a3a06ac992701711)
---
 daemon/remote.c              | 7 +++++++
 src/remote/remote_driver.c   | 7 +++++++
 src/remote/remote_protocol.x | 8 ++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 42c1c47..512170b 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -4136,6 +4136,13 @@ remoteDispatchStoragePoolListAllVolumes(virNetServerPtr server ATTRIBUTE_UNUSED,
                                               args->flags)) < 0)
         goto cleanup;
 
+    if (nvols > REMOTE_STORAGE_VOL_LIST_MAX) {
+        virReportError(VIR_ERR_RPC,
+                       _("Too many storage volumes '%d' for limit '%d'"),
+                       nvols, REMOTE_STORAGE_VOL_LIST_MAX);
+        goto cleanup;
+    }
+
     if (vols && nvols) {
         if (VIR_ALLOC_N(ret->vols.vols_val, nvols) < 0)
             goto cleanup;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 622647b..542cb39 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3343,6 +3343,13 @@ remoteStoragePoolListAllVolumes(virStoragePoolPtr pool,
              (char *) &ret) == -1)
         goto done;
 
+    if (ret.vols.vols_len > REMOTE_STORAGE_VOL_LIST_MAX) {
+        virReportError(VIR_ERR_RPC,
+                       _("Too many storage volumes '%d' for limit '%d'"),
+                       ret.vols.vols_len, REMOTE_STORAGE_VOL_LIST_MAX);
+        goto cleanup;
+    }
+
     if (vols) {
         if (VIR_ALLOC_N(tmp_vols, ret.vols.vols_len + 1) < 0)
             goto cleanup;
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 6e996b4..2034aa1 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -100,8 +100,8 @@ const REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX = 16384;
 /* Upper limit on lists of storage pools. */
 const REMOTE_STORAGE_POOL_LIST_MAX = 4096;
 
-/* Upper limit on lists of storage vol names. */
-const REMOTE_STORAGE_VOL_NAME_LIST_MAX = 16384;
+/* Upper limit on lists of storage vols. */
+const REMOTE_STORAGE_VOL_LIST_MAX = 16384;
 
 /* Upper limit on lists of node device names. */
 const REMOTE_NODE_DEVICE_NAME_LIST_MAX = 16384;
@@ -1746,7 +1746,7 @@ struct remote_storage_pool_list_volumes_args {
 };
 
 struct remote_storage_pool_list_volumes_ret {
-    remote_nonnull_string names<REMOTE_STORAGE_VOL_NAME_LIST_MAX>; /* insert@1 */
+    remote_nonnull_string names<REMOTE_STORAGE_VOL_LIST_MAX>; /* insert@1 */
 };
 
 
@@ -2681,7 +2681,7 @@ struct remote_storage_pool_list_all_volumes_args {
 };
 
 struct remote_storage_pool_list_all_volumes_ret {
-    remote_nonnull_storage_vol vols<>;
+    remote_nonnull_storage_vol vols<REMOTE_STORAGE_VOL_LIST_MAX>;
     unsigned int ret;
 };
 
-- 
1.8.3.2