1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

device_id: _get_devs_with_serial_numbers add missing free

on malloc failure path
This commit is contained in:
David Teigland 2022-12-01 11:43:24 -06:00
parent 7552ed9010
commit e71b434663

View File

@ -2124,11 +2124,11 @@ static void _get_devs_with_serial_numbers(struct cmd_context *cmd, struct dm_lis
if (id->idtype == DEV_ID_TYPE_SYS_SERIAL) {
if (str_list_match_item(serial_str_list, id->idname)) {
if (!(devl = dm_pool_zalloc(cmd->mem, sizeof(*devl))))
goto next_dev;
goto next_continue;
devl->dev = dev;
dm_list_add(devs, &devl->list);
}
goto next_dev;
goto next_continue;
}
}
@ -2145,20 +2145,22 @@ static void _get_devs_with_serial_numbers(struct cmd_context *cmd, struct dm_lis
if ((idname = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_SERIAL))) {
if (str_list_match_item(serial_str_list, idname)) {
if (!(devl = dm_pool_zalloc(cmd->mem, sizeof(*devl))))
goto next_dev;
goto next_free;
if (!(id = zalloc(sizeof(struct dev_id))))
goto next_dev;
goto next_free;
id->idtype = DEV_ID_TYPE_SYS_SERIAL;
id->idname = (char *)idname;
id->dev = dev;
dm_list_add(&dev->ids, &id->list);
devl->dev = dev;
dm_list_add(devs, &devl->list);
} else {
free((char *)idname);
idname = NULL;
}
}
next_dev:
next_free:
if (idname)
free((char *)idname);
next_continue:
continue;
}
dev_iter_destroy(iter);