Skip to content

Commit

Permalink
bus/vmbus: fix leak on device scan
Browse files Browse the repository at this point in the history
[ upstream commit c6c865d ]

Caught running ASAN.
The device name was leaked on scan.
rte_device name field being a const, use a local pointer and release
in error path.

Fixes: 831dba4 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Long Li <longli@microsoft.com>
  • Loading branch information
david-marchand authored and cpaelzer committed Nov 30, 2021
1 parent 4ca7fab commit 6586da2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/bus/vmbus/linux/vmbus_bus.c
Expand Up @@ -236,13 +236,14 @@ vmbus_scan_one(const char *name)
char filename[PATH_MAX];
char dirname[PATH_MAX];
unsigned long tmp;
char *dev_name;

dev = calloc(1, sizeof(*dev));
if (dev == NULL)
return -1;

dev->device.bus = &rte_vmbus_bus.bus;
dev->device.name = strdup(name);
dev->device.name = dev_name = strdup(name);
if (!dev->device.name)
goto error;

Expand All @@ -261,6 +262,7 @@ vmbus_scan_one(const char *name)

/* skip non-network devices */
if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) {
free(dev_name);
free(dev);
return 0;
}
Expand Down Expand Up @@ -312,6 +314,7 @@ vmbus_scan_one(const char *name)
} else { /* already registered */
VMBUS_LOG(NOTICE,
"%s already registered", name);
free(dev_name);
free(dev);
}
return 0;
Expand All @@ -322,6 +325,7 @@ vmbus_scan_one(const char *name)
error:
VMBUS_LOG(DEBUG, "failed");

free(dev_name);
free(dev);
return -1;
}
Expand Down

0 comments on commit 6586da2

Please sign in to comment.