shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

Add bounds checking on virConnectListAllNWFilters RPC call

Browse Source 
The return values for the virConnectListAllNWFilters 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:47:22 +01:00
parent 1dcff6a7ea
commit 12034511a1
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/remote.c
View File

@ -4374,6 +4374,13 @@ remoteDispatchConnectListAllNWFilters(virNetServerPtr server ATTRIBUTE_UNUSED,
args->flags)) < 0) args->flags)) < 0)
goto cleanup; goto cleanup;
if (nfilters > REMOTE_NWFILTER_LIST_MAX) {
virReportError(VIR_ERR_RPC,
_("Too many network filters '%d' for limit '%d'"),
nfilters, REMOTE_NWFILTER_LIST_MAX);
goto cleanup;
}
if (filters && nfilters) { if (filters && nfilters) {
if (VIR_ALLOC_N(ret->filters.filters_val, nfilters) < 0) if (VIR_ALLOC_N(ret->filters.filters_val, nfilters) < 0)
goto cleanup; goto cleanup;

7
src/remote/remote_driver.c
View File

@ -3041,6 +3041,13 @@ remoteConnectListAllNWFilters(virConnectPtr conn,
(char *) &ret) == -1) (char *) &ret) == -1)
goto done; goto done;
if (ret.filters.filters_len > REMOTE_NWFILTER_LIST_MAX) {
virReportError(VIR_ERR_RPC,
_("Too many network filters '%d' for limit '%d'"),
ret.filters.filters_len, REMOTE_NWFILTER_LIST_MAX);
goto cleanup;
}
if (filters) { if (filters) {
if (VIR_ALLOC_N(tmp_filters, ret.filters.filters_len + 1) < 0) if (VIR_ALLOC_N(tmp_filters, ret.filters.filters_len + 1) < 0)
goto cleanup; goto cleanup;

8
src/remote/remote_protocol.x
View File

@ -106,8 +106,8 @@ const REMOTE_NODE_DEVICE_LIST_MAX = 16384;
/* Upper limit on lists of node device capabilities. */ /* Upper limit on lists of node device capabilities. */
const REMOTE_NODE_DEVICE_CAPS_LIST_MAX = 65536; const REMOTE_NODE_DEVICE_CAPS_LIST_MAX = 65536;
/* Upper limit on lists of network filter names. */ /* Upper limit on lists of network filters. */
const REMOTE_NWFILTER_NAME_LIST_MAX = 1024; const REMOTE_NWFILTER_LIST_MAX = 1024;
/* Upper limit on list of scheduler parameters. */ /* Upper limit on list of scheduler parameters. */
const REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX = 16; const REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX = 16;
@ -1423,7 +1423,7 @@ struct remote_connect_list_nwfilters_args {
}; };
struct remote_connect_list_nwfilters_ret { struct remote_connect_list_nwfilters_ret {
remote_nonnull_string names<REMOTE_NWFILTER_NAME_LIST_MAX>; /* insert@1 */ remote_nonnull_string names<REMOTE_NWFILTER_LIST_MAX>; /* insert@1 */
}; };
struct remote_nwfilter_lookup_by_uuid_args { struct remote_nwfilter_lookup_by_uuid_args {
@ -2718,7 +2718,7 @@ struct remote_connect_list_all_nwfilters_args {
}; };
struct remote_connect_list_all_nwfilters_ret { struct remote_connect_list_all_nwfilters_ret {
remote_nonnull_nwfilter filters<>; remote_nonnull_nwfilter filters<REMOTE_NWFILTER_LIST_MAX>;
unsigned int ret; unsigned int ret;
}; };