mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-18 10:04:20 +03:00
Fix two potential NULL pointer derefs in error cases in vg_read().
This commit is contained in:
parent
e0a266927d
commit
5095de5177
@ -1,5 +1,6 @@
|
|||||||
Version 2.02.11 -
|
Version 2.02.11 -
|
||||||
=====================================
|
=====================================
|
||||||
|
Fix two potential NULL pointer derefs in error cases in vg_read().
|
||||||
Separate --enable-cluster from locking lib options in lvmconf.sh.
|
Separate --enable-cluster from locking lib options in lvmconf.sh.
|
||||||
Add a missing comma in lvcreate man page.
|
Add a missing comma in lvcreate man page.
|
||||||
|
|
||||||
|
@ -1044,7 +1044,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
|
|||||||
if (correct_vg) {
|
if (correct_vg) {
|
||||||
if (list_size(&correct_vg->pvs) != list_size(pvids)) {
|
if (list_size(&correct_vg->pvs) != list_size(pvids)) {
|
||||||
log_debug("Cached VG %s had incorrect PV list",
|
log_debug("Cached VG %s had incorrect PV list",
|
||||||
vg->name);
|
vgname);
|
||||||
|
|
||||||
if (memlock())
|
if (memlock())
|
||||||
inconsistent = 1;
|
inconsistent = 1;
|
||||||
@ -1053,7 +1053,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
|
|||||||
} else list_iterate_items(pvl, &correct_vg->pvs) {
|
} else list_iterate_items(pvl, &correct_vg->pvs) {
|
||||||
if (!str_list_match_item(pvids, pvl->pv->dev->pvid)) {
|
if (!str_list_match_item(pvids, pvl->pv->dev->pvid)) {
|
||||||
log_debug("Cached VG %s had incorrect PV list",
|
log_debug("Cached VG %s had incorrect PV list",
|
||||||
vg->name);
|
vgname);
|
||||||
correct_vg = NULL;
|
correct_vg = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user