From 9f561f2206bd893ea5ef7052debaff2af97006d1 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Fri, 3 May 2019 16:51:34 -0500 Subject: [PATCH] pvscan: fix segfault in recent commit commit aa75b31db5478 "pvscan: handle case of scanning PV without metadata last" failed to recognize that an arg may be null in the case of 'pvscan --cache' (without -aay) which does not keep track of complete VGs because it does not need to activate them. --- tools/pvscan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/pvscan.c b/tools/pvscan.c index e38910654..6d8942625 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -759,6 +759,10 @@ static void _check_vg_with_pvid_complete(struct cmd_context *cmd, * * . When dev_args is set, then complete VGs that that contain * devs in dev_args will be returned in found_vgnames. + * + * found_vgnames is null for 'pvscan --cache' (without -aay) + * since the command does not need to keep track of complete + * vgs since it does not need to activate them. */ static void _online_pvscan_all_devs(struct cmd_context *cmd, @@ -794,7 +798,7 @@ static void _online_pvscan_all_devs(struct cmd_context *cmd, } /* This PV without metadata may complete a VG. */ - if (pvid_without_metadata) + if (pvid_without_metadata && found_vgnames) _check_vg_with_pvid_complete(cmd, found_vgnames, &all_vgs, pvid_without_metadata); }