| Message ID | 1358356509-28742-3-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 16 Jan 2013 18:15:09 +0100 Markus Armbruster <armbru@redhat.com> wrote: > Spotted by Coverity. I'd split that patch, but you don't have to respin just because of that. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > qga/commands-posix.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index f95ebc8..d6902a9 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -935,9 +935,11 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > error_setg_errno(errp, errno, > "failed to get MAC address of %s", > ifa->ifa_name); > + close(sock); > goto error; > } > > + close(sock); > mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; > > if (asprintf(&info->value->hardware_address, > @@ -950,20 +952,19 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > } > > info->value->has_hardware_address = true; > - close(sock); > } > > if (ifa->ifa_addr && > ifa->ifa_addr->sa_family == AF_INET) { > /* interface with IPv4 address */ > - address_item = g_malloc0(sizeof(*address_item)); > - address_item->value = g_malloc0(sizeof(*address_item->value)); > p = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; > if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) { > error_setg_errno(errp, errno, "inet_ntop failed"); > goto error; > } > > + address_item = g_malloc0(sizeof(*address_item)); > + address_item->value = g_malloc0(sizeof(*address_item->value)); > address_item->value->ip_address = g_strdup(addr4); > address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4; > > @@ -976,14 +977,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > } else if (ifa->ifa_addr && > ifa->ifa_addr->sa_family == AF_INET6) { > /* interface with IPv6 address */ > - address_item = g_malloc0(sizeof(*address_item)); > - address_item->value = g_malloc0(sizeof(*address_item->value)); > p = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr; > if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) { > error_setg_errno(errp, errno, "inet_ntop failed"); > goto error; > } > > + address_item = g_malloc0(sizeof(*address_item)); > + address_item->value = g_malloc0(sizeof(*address_item->value)); > address_item->value->ip_address = g_strdup(addr6); > address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6; >
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index f95ebc8..d6902a9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -935,9 +935,11 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) error_setg_errno(errp, errno, "failed to get MAC address of %s", ifa->ifa_name); + close(sock); goto error; } + close(sock); mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; if (asprintf(&info->value->hardware_address, @@ -950,20 +952,19 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } info->value->has_hardware_address = true; - close(sock); } if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) { /* interface with IPv4 address */ - address_item = g_malloc0(sizeof(*address_item)); - address_item->value = g_malloc0(sizeof(*address_item->value)); p = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) { error_setg_errno(errp, errno, "inet_ntop failed"); goto error; } + address_item = g_malloc0(sizeof(*address_item)); + address_item->value = g_malloc0(sizeof(*address_item->value)); address_item->value->ip_address = g_strdup(addr4); address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV4; @@ -976,14 +977,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } else if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET6) { /* interface with IPv6 address */ - address_item = g_malloc0(sizeof(*address_item)); - address_item->value = g_malloc0(sizeof(*address_item->value)); p = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr; if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) { error_setg_errno(errp, errno, "inet_ntop failed"); goto error; } + address_item = g_malloc0(sizeof(*address_item)); + address_item->value = g_malloc0(sizeof(*address_item->value)); address_item->value->ip_address = g_strdup(addr6); address_item->value->ip_address_type = GUEST_IP_ADDRESS_TYPE_IPV6;
Spotted by Coverity. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qga/commands-posix.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)