|
 |
43fe83 |
From 0c0ab54756999324d57973ff4b0102a54bc0b7af Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <0c0ab54756999324d57973ff4b0102a54bc0b7af.1377873640.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
43fe83 |
Date: Fri, 30 Aug 2013 11:16:10 +0100
|
|
|
43fe83 |
Subject: [PATCH] Add bounds checking on virConnectListAllInterfaces RPC call
|
|
|
43fe83 |
|
|
|
43fe83 |
For
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1002667
|
|
|
43fe83 |
|
|
|
43fe83 |
The return values for the virConnectListAllInterfaces 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 8be2172897c272ead150ad59a63946ab97562a11)
|
|
|
43fe83 |
---
|
|
|
43fe83 |
daemon/remote.c | 7 +++++++
|
|
|
43fe83 |
src/remote/remote_driver.c | 7 +++++++
|
|
|
43fe83 |
src/remote/remote_protocol.x | 13 +++++--------
|
|
|
43fe83 |
3 files changed, 19 insertions(+), 8 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/daemon/remote.c b/daemon/remote.c
|
|
|
43fe83 |
index b6501e0..871b0df 100644
|
|
|
43fe83 |
--- a/daemon/remote.c
|
|
|
43fe83 |
+++ b/daemon/remote.c
|
|
|
43fe83 |
@@ -4256,6 +4256,13 @@ remoteDispatchConnectListAllInterfaces(virNetServerPtr server ATTRIBUTE_UNUSED,
|
|
|
43fe83 |
args->flags)) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (nifaces > REMOTE_INTERFACE_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many interfaces '%d' for limit '%d'"),
|
|
|
43fe83 |
+ nifaces, REMOTE_INTERFACE_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (ifaces && nifaces) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(ret->ifaces.ifaces_val, nifaces) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
|
|
|
43fe83 |
index e555704..4d82452 100644
|
|
|
43fe83 |
--- a/src/remote/remote_driver.c
|
|
|
43fe83 |
+++ b/src/remote/remote_driver.c
|
|
|
43fe83 |
@@ -2909,6 +2909,13 @@ remoteConnectListAllInterfaces(virConnectPtr conn,
|
|
|
43fe83 |
(char *) &ret) == -1)
|
|
|
43fe83 |
goto done;
|
|
|
43fe83 |
|
|
|
43fe83 |
+ if (ret.ifaces.ifaces_len > REMOTE_INTERFACE_LIST_MAX) {
|
|
|
43fe83 |
+ virReportError(VIR_ERR_RPC,
|
|
|
43fe83 |
+ _("Too many interfaces '%d' for limit '%d'"),
|
|
|
43fe83 |
+ ret.ifaces.ifaces_len, REMOTE_INTERFACE_LIST_MAX);
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
+ }
|
|
|
43fe83 |
+
|
|
|
43fe83 |
if (ifaces) {
|
|
|
43fe83 |
if (VIR_ALLOC_N(tmp_ifaces, ret.ifaces.ifaces_len + 1) < 0)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
|
|
|
43fe83 |
index f1e27fa..573d63f 100644
|
|
|
43fe83 |
--- a/src/remote/remote_protocol.x
|
|
|
43fe83 |
+++ b/src/remote/remote_protocol.x
|
|
|
43fe83 |
@@ -91,11 +91,8 @@ const REMOTE_MIGRATE_COOKIE_MAX = 16384;
|
|
|
43fe83 |
/* Upper limit on lists of networks. */
|
|
|
43fe83 |
const REMOTE_NETWORK_LIST_MAX = 16384;
|
|
|
43fe83 |
|
|
|
43fe83 |
-/* Upper limit on lists of interface names. */
|
|
|
43fe83 |
-const REMOTE_INTERFACE_NAME_LIST_MAX = 16384;
|
|
|
43fe83 |
-
|
|
|
43fe83 |
-/* Upper limit on lists of defined interface names. */
|
|
|
43fe83 |
-const REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX = 16384;
|
|
|
43fe83 |
+/* Upper limit on lists of interfaces. */
|
|
|
43fe83 |
+const REMOTE_INTERFACE_LIST_MAX = 16384;
|
|
|
43fe83 |
|
|
|
43fe83 |
/* Upper limit on lists of storage pools. */
|
|
|
43fe83 |
const REMOTE_STORAGE_POOL_LIST_MAX = 4096;
|
|
|
43fe83 |
@@ -1478,7 +1475,7 @@ struct remote_connect_list_interfaces_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_connect_list_interfaces_ret {
|
|
|
43fe83 |
- remote_nonnull_string names<REMOTE_INTERFACE_NAME_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
+ remote_nonnull_string names<REMOTE_INTERFACE_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_connect_num_of_defined_interfaces_ret {
|
|
|
43fe83 |
@@ -1490,7 +1487,7 @@ struct remote_connect_list_defined_interfaces_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_connect_list_defined_interfaces_ret {
|
|
|
43fe83 |
- remote_nonnull_string names<REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
+ remote_nonnull_string names<REMOTE_INTERFACE_LIST_MAX>; /* insert@1 */
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_interface_lookup_by_name_args {
|
|
|
43fe83 |
@@ -2701,7 +2698,7 @@ struct remote_connect_list_all_interfaces_args {
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
struct remote_connect_list_all_interfaces_ret {
|
|
|
43fe83 |
- remote_nonnull_interface ifaces<>;
|
|
|
43fe83 |
+ remote_nonnull_interface ifaces<REMOTE_INTERFACE_LIST_MAX>;
|
|
|
43fe83 |
unsigned int ret;
|
|
|
43fe83 |
};
|
|
|
43fe83 |
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|