External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add bounds checking on virConnectListAllInterfaces RPC call

Browse Source 
The return values for the virConnectListAllInterfaces 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>
This commit is contained in:
Daniel P. Berrange 2013-08-19 14:41:56 +01:00
parent 174f7dd5ba
commit 8be2172897
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/remote.c
View File

@ -4256,6 +4256,13 @@ remoteDispatchConnectListAllInterfaces(virNetServerPtr server ATTRIBUTE_UNUSED,
args->flags)) < 0) args->flags)) < 0)
goto cleanup; goto cleanup;
if (nifaces > REMOTE_INTERFACE_LIST_MAX) {
virReportError(VIR_ERR_RPC,
_("Too many interfaces '%d' for limit '%d'"),
nifaces, REMOTE_INTERFACE_LIST_MAX);
goto cleanup;
}
if (ifaces && nifaces) { if (ifaces && nifaces) {
if (VIR_ALLOC_N(ret->ifaces.ifaces_val, nifaces) < 0) if (VIR_ALLOC_N(ret->ifaces.ifaces_val, nifaces) < 0)
goto cleanup; goto cleanup;

7
src/remote/remote_driver.c
View File

@ -2909,6 +2909,13 @@ remoteConnectListAllInterfaces(virConnectPtr conn,
(char *) &ret) == -1) (char *) &ret) == -1)
goto done; goto done;
if (ret.ifaces.ifaces_len > REMOTE_INTERFACE_LIST_MAX) {
virReportError(VIR_ERR_RPC,
_("Too many interfaces '%d' for limit '%d'"),
ret.ifaces.ifaces_len, REMOTE_INTERFACE_LIST_MAX);
goto cleanup;
}
if (ifaces) { if (ifaces) {
if (VIR_ALLOC_N(tmp_ifaces, ret.ifaces.ifaces_len + 1) < 0) if (VIR_ALLOC_N(tmp_ifaces, ret.ifaces.ifaces_len + 1) < 0)
goto cleanup; goto cleanup;

13
src/remote/remote_protocol.x
View File

@ -91,11 +91,8 @@ const REMOTE_MIGRATE_COOKIE_MAX = 16384;
/* Upper limit on lists of networks. */ /* Upper limit on lists of networks. */
const REMOTE_NETWORK_LIST_MAX = 16384; const REMOTE_NETWORK_LIST_MAX = 16384;
/* Upper limit on lists of interface names. */ /* Upper limit on lists of interfaces. */
const REMOTE_INTERFACE_NAME_LIST_MAX = 16384; const REMOTE_INTERFACE_LIST_MAX = 16384;
/* Upper limit on lists of defined interface names. */
const REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX = 16384;
/* Upper limit on lists of storage pools. */ /* Upper limit on lists of storage pools. */
const REMOTE_STORAGE_POOL_LIST_MAX = 4096; const REMOTE_STORAGE_POOL_LIST_MAX = 4096;
@ -1478,7 +1475,7 @@ struct remote_connect_list_interfaces_args {
}; };
struct remote_connect_list_interfaces_ret { struct remote_connect_list_interfaces_ret {
remote_nonnull_string names<REMOTE_INTERFACE_NAME_LIST_MAX>; /* insert@1 */ remote_nonnull_string names<REMOTE_INTERFACE_LIST_MAX>; /* insert@1 */
}; };
struct remote_connect_num_of_defined_interfaces_ret { struct remote_connect_num_of_defined_interfaces_ret {
@ -1490,7 +1487,7 @@ struct remote_connect_list_defined_interfaces_args {
}; };
struct remote_connect_list_defined_interfaces_ret { struct remote_connect_list_defined_interfaces_ret {
remote_nonnull_string names<REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX>; /* insert@1 */ remote_nonnull_string names<REMOTE_INTERFACE_LIST_MAX>; /* insert@1 */
}; };
struct remote_interface_lookup_by_name_args { struct remote_interface_lookup_by_name_args {
@ -2701,7 +2698,7 @@ struct remote_connect_list_all_interfaces_args {
}; };
struct remote_connect_list_all_interfaces_ret { struct remote_connect_list_all_interfaces_ret {
remote_nonnull_interface ifaces<>; remote_nonnull_interface ifaces<REMOTE_INTERFACE_LIST_MAX>;
unsigned int ret; unsigned int ret;
}; };