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

format1: check for lvm1_system_id

Browse Source 
As in the code above in this function continue to check for
lvm1_system_id pointer existance before dereferencing it
(Coverity).
This commit is contained in:
Zdenek Kabelac 2015-05-07 13:09:43 +02:00
parent 05934d2538
commit 950a21d58a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/format1/import-export.c
View File

@ -180,7 +180,7 @@ int export_pv(struct cmd_context *cmd, struct dm_pool *mem __attribute__((unused
} }
/* Is VG being imported? */ /* Is VG being imported? */
if (vg && !vg_is_exported(vg) && *vg->lvm1_system_id && if (vg && !vg_is_exported(vg) && vg->lvm1_system_id && *vg->lvm1_system_id &&
!strncmp(vg->lvm1_system_id, EXPORTED_TAG, sizeof(EXPORTED_TAG) - 1)) { !strncmp(vg->lvm1_system_id, EXPORTED_TAG, sizeof(EXPORTED_TAG) - 1)) {
if (!generate_lvm1_system_id(cmd, (char *)pvd->system_id, IMPORTED_TAG)) if (!generate_lvm1_system_id(cmd, (char *)pvd->system_id, IMPORTED_TAG))
return_0; return_0;
@ -192,7 +192,7 @@ int export_pv(struct cmd_context *cmd, struct dm_pool *mem __attribute__((unused
return_0; return_0;
/* Update internal system_id if we changed it */ /* Update internal system_id if we changed it */
if (vg && if (vg && vg->lvm1_system_id &&
(!*vg->lvm1_system_id || (!*vg->lvm1_system_id ||
strncmp(vg->lvm1_system_id, (char *)pvd->system_id, sizeof(pvd->system_id)))) strncmp(vg->lvm1_system_id, (char *)pvd->system_id, sizeof(pvd->system_id))))
strncpy(vg->lvm1_system_id, (char *)pvd->system_id, NAME_LEN); strncpy(vg->lvm1_system_id, (char *)pvd->system_id, NAME_LEN);