2009/8/20 Chris Lalancette <[email protected]>:
> Matthias Bolte wrote:
>> Hi,
>>
>> I came across this line in the phypOpen function:
>>
>> char string[strlen(conn->uri->path)];
>>
>> Here the path part of the given URI is used without checking it for
>> NULL, this can cause a segfault as strlen expects a string != NULL.
>> Beside that uuid_db and connection_data leak in case of an error.
>>
>> In this line
>>
>> conn->uri->path = string;
>>
>> the original path of the URI leaks. The patch adds a VIR_FREE call
>> before setting the new path.
>>
>> The attached patch is compile-tested but I don't have a Power
>> Hypervisor installation at hand to test it for real.
>
> I've now committed this patch (with some slight munging to get it to apply to
> recent libvirt.git).
>
> Thanks,
> --
> Chris Lalancette
>
Well, you should have applied version 2 of this patch, because version
1 was invalidated by changes to escape_specialcharacters(). It now
takes a length argument, but string isn't an array anymore (but a char
pointer), so sizeof(string) does no longer the right thing:
escape_specialcharacters(conn->uri->path, string, sizeof(string))
I attached patch version 2 again.
Matthias
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index f457cf4..9b46696 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -63,25 +63,18 @@ static virDrvOpenStatus
phypOpen(virConnectPtr conn,
virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED)
{
- SSH_SESSION *session;
- ConnectionData *connection_data;
- char string[strlen(conn->uri->path)];
-
+ SSH_SESSION *session = NULL;
+ ConnectionData *connection_data = NULL;
+ char *string = NULL;
+ size_t len = 0;
uuid_dbPtr uuid_db = NULL;
- if (VIR_ALLOC(uuid_db) < 0)
- virReportOOMError(conn);
-
- if (VIR_ALLOC(connection_data) < 0)
- virReportOOMError(conn);
-
if (!conn || !conn->uri)
return VIR_DRV_OPEN_DECLINED;
if (conn->uri->scheme == NULL || STRNEQ(conn->uri->scheme, "phyp"))
return VIR_DRV_OPEN_DECLINED;
-
if (conn->uri->server == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s",
@@ -96,20 +89,38 @@ phypOpen(virConnectPtr conn,
return VIR_DRV_OPEN_ERROR;
}
- if (escape_specialcharacters(conn->uri->path, string, sizeof(string)) == -1) {
+ if (VIR_ALLOC(uuid_db) < 0) {
+ virReportOOMError(conn);
+ goto failure;
+ }
+
+ if (VIR_ALLOC(connection_data) < 0) {
+ virReportOOMError(conn);
+ goto failure;
+ }
+
+ len = strlen(conn->uri->path) + 1;
+
+ if (VIR_ALLOC_N(string, len) < 0) {
+ virReportOOMError(conn);
+ goto failure;
+ }
+
+ if (escape_specialcharacters(conn->uri->path, string, len) == -1) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s",
_("Error parsing 'path'. Invalid characters."));
- return VIR_DRV_OPEN_ERROR;
+ goto failure;
}
if ((session = openSSHSession(conn, auth)) == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s",
_("Error while opening SSH session."));
- return VIR_DRV_OPEN_ERROR;
+ goto failure;
}
+ VIR_FREE(conn->uri->path);
conn->uri->path = string;
connection_data->session = session;
connection_data->auth = auth;
@@ -122,6 +133,13 @@ phypOpen(virConnectPtr conn,
init_uuid_db(conn);
return VIR_DRV_OPEN_SUCCESS;
+
+ failure:
+ VIR_FREE(uuid_db);
+ VIR_FREE(connection_data);
+ VIR_FREE(string);
+
+ return VIR_DRV_OPEN_ERROR;
}
static int
--
Libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
