NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve invalid argument checks for the public API

Browse Source
This commit is contained in:
Matthias Bolte 2011-05-18 11:42:50 +02:00
parent 191e1ec65c
commit 4d2a189646
1 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/libvirt.c
View File

@ -1390,7 +1390,7 @@ int
virConnectRef(virConnectPtr conn) virConnectRef(virConnectPtr conn)
{ {
if ((!VIR_IS_CONNECT(conn))) { if ((!VIR_IS_CONNECT(conn))) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
@ -4490,7 +4490,6 @@ virDomainMigratePrepareTunnel(virConnectPtr conn,
const char *dname, const char *dname,
unsigned long bandwidth, unsigned long bandwidth,
const char *dom_xml) const char *dom_xml)
{ {
VIR_DEBUG("conn=%p, stream=%p, flags=%lu, dname=%s, " VIR_DEBUG("conn=%p, stream=%p, flags=%lu, dname=%s, "
"bandwidth=%lu, dom_xml=%s", conn, st, flags, "bandwidth=%lu, dom_xml=%s", conn, st, flags,
@ -5621,7 +5620,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *path, virDomainBlockInfoP
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (info == NULL) { if (path == NULL || info == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error; goto error;
} }
@ -6527,6 +6526,12 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml)
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (xml == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (domain->conn->flags & VIR_CONNECT_RO) { if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -6587,6 +6592,12 @@ virDomainAttachDeviceFlags(virDomainPtr domain,
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (xml == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (domain->conn->flags & VIR_CONNECT_RO) { if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -6632,6 +6643,12 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml)
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (xml == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (domain->conn->flags & VIR_CONNECT_RO) { if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -6688,6 +6705,12 @@ virDomainDetachDeviceFlags(virDomainPtr domain,
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (xml == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (domain->conn->flags & VIR_CONNECT_RO) { if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -6748,6 +6771,12 @@ virDomainUpdateDeviceFlags(virDomainPtr domain,
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
if (xml == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (domain->conn->flags & VIR_CONNECT_RO) { if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -7408,7 +7437,7 @@ int
virNetworkRef(virNetworkPtr network) virNetworkRef(virNetworkPtr network)
{ {
if ((!VIR_IS_CONNECTED_NETWORK(network))) { if ((!VIR_IS_CONNECTED_NETWORK(network))) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); virLibConnError(VIR_ERR_INVALID_NETWORK, __FUNCTION__);
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
@ -8274,7 +8303,7 @@ int
virInterfaceRef(virInterfacePtr iface) virInterfaceRef(virInterfacePtr iface)
{ {
if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { if ((!VIR_IS_CONNECTED_INTERFACE(iface))) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); virLibConnError(VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
virDispatchError(NULL); virDispatchError(NULL);
return -1; return -1;
} }
@ -8717,7 +8746,7 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) {
virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); virLibConnError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__);
virDispatchError(NULL); virDispatchError(NULL);
return NULL; return NULL;
} }
@ -9789,6 +9818,11 @@ virStorageVolCreateXML(virStoragePoolPtr pool,
return NULL; return NULL;
} }
if (xmldesc == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (pool->conn->flags & VIR_CONNECT_RO) { if (pool->conn->flags & VIR_CONNECT_RO) {
virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;
@ -9845,6 +9879,11 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool,
goto error; goto error;
} }
if (xmldesc == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (pool->conn->flags & VIR_CONNECT_RO || if (pool->conn->flags & VIR_CONNECT_RO ||
clonevol->conn->flags & VIR_CONNECT_RO) { clonevol->conn->flags & VIR_CONNECT_RO) {
virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
@ -10595,6 +10634,11 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev,
return -1; return -1;
} }
if (names == NULL || maxnames < 0) {
virLibNodeDeviceError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) { if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) {
int ret; int ret;
ret = dev->conn->deviceMonitor->deviceListCaps (dev, names, maxnames); ret = dev->conn->deviceMonitor->deviceListCaps (dev, names, maxnames);
@ -11853,6 +11897,11 @@ int virStreamSend(virStreamPtr stream,
return -1; return -1;
} }
if (data == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (stream->driver && if (stream->driver &&
stream->driver->streamSend) { stream->driver->streamSend) {
int ret; int ret;
@ -11948,6 +11997,11 @@ int virStreamRecv(virStreamPtr stream,
return -1; return -1;
} }
if (data == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (stream->driver && if (stream->driver &&
stream->driver->streamRecv) { stream->driver->streamRecv) {
int ret; int ret;
@ -12024,6 +12078,11 @@ int virStreamSendAll(virStreamPtr stream,
return -1; return -1;
} }
if (handler == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto cleanup;
}
if (stream->flags & VIR_STREAM_NONBLOCK) { if (stream->flags & VIR_STREAM_NONBLOCK) {
virLibConnError(VIR_ERR_OPERATION_INVALID, virLibConnError(VIR_ERR_OPERATION_INVALID,
_("data sources cannot be used for non-blocking streams")); _("data sources cannot be used for non-blocking streams"));
@ -12121,6 +12180,11 @@ int virStreamRecvAll(virStreamPtr stream,
return -1; return -1;
} }
if (handler == NULL) {
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto cleanup;
}
if (stream->flags & VIR_STREAM_NONBLOCK) { if (stream->flags & VIR_STREAM_NONBLOCK) {
virLibConnError(VIR_ERR_OPERATION_INVALID, virLibConnError(VIR_ERR_OPERATION_INVALID,
_("data sinks cannot be used for non-blocking streams")); _("data sinks cannot be used for non-blocking streams"));
@ -13835,6 +13899,12 @@ virDomainSnapshotCreateXML(virDomainPtr domain,
} }
conn = domain->conn; conn = domain->conn;
if (xmlDesc == NULL) {
virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
if (conn->flags & VIR_CONNECT_RO) { if (conn->flags & VIR_CONNECT_RO) {
virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error; goto error;