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

Fix crash accessing a NULL URI when looking up auth credentials

Browse Source 
When auto-probing hypervisor drivers, the conn->uri field will
initially be NULL. Care must be taken not to access members
when doing auth lookups in the config file

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-09-12 16:40:08 +01:00
parent 1437ea6f48
commit ab42772a46
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/remote_driver.c
View File

@ -3726,7 +3726,7 @@ static int remoteAuthFillFromConfig(virConnectPtr conn,
if (virAuthConfigLookup(state->config, if (virAuthConfigLookup(state->config,
"libvirt", "libvirt",
conn->uri->server, VIR_URI_SERVER(conn->uri),
credname, credname,
&value) < 0) &value) < 0)
goto cleanup; goto cleanup;

2
src/util/virauth.c
View File

@ -130,7 +130,7 @@ virAuthGetCredential(virConnectPtr conn,
if (virAuthConfigLookup(config, if (virAuthConfigLookup(config,
servicename, servicename,
conn->uri->server, VIR_URI_SERVER(conn->uri),
credname, credname,
&tmp) < 0) &tmp) < 0)
goto cleanup; goto cleanup;

2
src/util/viruri.h
View File

@ -60,4 +60,6 @@ char *virURIFormatParams(virURIPtr uri);
void virURIFree(virURIPtr uri); void virURIFree(virURIPtr uri);
# define VIR_URI_SERVER(uri) ((uri) && (uri)->server ? (uri)->server : "localhost")
#endif /* __VIR_URI_H__ */ #endif /* __VIR_URI_H__ */