From d41c8aed578be066ddb6ca05bd20253cc9eda818 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 29 Nov 2010 11:08:14 +0000 Subject: [PATCH] Reset vg pointer after release Set vg to NULL after releasing it as the following memlock() test may lead to goto for the second call of vg_release() with the already released vg pointer. --- WHATS_NEW | 1 + lib/metadata/metadata.c | 1 + 2 files changed, 2 insertions(+) diff --git a/WHATS_NEW b/WHATS_NEW index 5cb281cbb..a76b2a74a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.78 - ==================================== + Fix missing reset of vg pointer after vg_release() in _vg_read_by_vgid(). Fix test for empty system_dir string in _init_backup(). Certain lvconvert invocations are now required to be done in two steps. Fix missing context desctruction in err path of lvm1 fallback in lvm2_main(). diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 780b806fe..743d63301 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3117,6 +3117,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, return vg; } vg_release(vg); + vg = NULL; /* reset so memlock goto out is safe */ } /* Mustn't scan if memory locked: ensure cache gets pre-populated! */ -- 2.43.5