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

cov: add checks to prevent NULL dereference

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-04-22 15:08:04 +02:00
parent 3d96203e21
commit d7237ca63a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/device/device_id.c
View File

@ -523,7 +523,7 @@ int device_ids_read(struct cmd_context *cmd)
_copy_idline_str(line, _devices_file_systemid, sizeof(_devices_file_systemid)); _copy_idline_str(line, _devices_file_systemid, sizeof(_devices_file_systemid));
log_debug("read devices file systemid %s", _devices_file_systemid); log_debug("read devices file systemid %s", _devices_file_systemid);
if ((!cmd->system_id && _devices_file_systemid[0]) || if ((!cmd->system_id && _devices_file_systemid[0]) ||
strcmp(cmd->system_id, _devices_file_systemid)) { (cmd->system_id && strcmp(cmd->system_id, _devices_file_systemid))) {
log_warn("WARNING: ignoring devices file with wrong system id %s vs local %s.", log_warn("WARNING: ignoring devices file with wrong system id %s vs local %s.",
_devices_file_systemid[0] ? _devices_file_systemid : "none", cmd->system_id ?: "none"); _devices_file_systemid[0] ? _devices_file_systemid : "none", cmd->system_id ?: "none");
free_dus(&cmd->use_devices); free_dus(&cmd->use_devices);
@ -1077,7 +1077,8 @@ id_done:
if (du_devid && (du_devid != du_dev)) { if (du_devid && (du_devid != du_dev)) {
log_warn("WARNING: device %s (%s) and %s (%s) have duplicate device ID.", log_warn("WARNING: device %s (%s) and %s (%s) have duplicate device ID.",
dev_name(dev), id->idname, dev_name(dev), id->idname,
du_pvid->dev ? dev_name(du_pvid->dev) : "none", du_pvid->idname); (du_pvid && du_pvid->dev) ? dev_name(du_pvid->dev) : "none",
du_pvid ? du_pvid->idname : "");
} }
if (du_pvid && (du_pvid != du_dev)) { if (du_pvid && (du_pvid != du_dev)) {