dumpconfig: fix memleak when using --mergedconfig

Check whether lvm dumpconfig --mergedconfig is used only
with --type current (where we're merging current config and
the config supplied on command line). With other types
the config was merged, but it was thrown away since we're
generating other type of config anyway. This lead to a memleak.

Error out if --mergedconfig is used with anything else than
--type current (or without specifying --type in which case
the --type current is used by default).

diff --git a/WHATS_NEW b/WHATS_NEW
index a20331be8360ce6aaefaf7885bd96f25e87926a1..de96f8a762fa7f3ebb841bbd78dbbe40749e6327 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.106 - 
 ====================================
+  Don't allow --mergedconfig without --type current in dumpconfig. Fix memleak.
   Make global/lvdisplay_shows_full_device_path lvm.conf setting profilable.
   Make global/{units|si_unit_consistency|suffix} lvm.conf setting profilable.
   Validate minimal chunk size for snapshot COW volume in lvconvert.

diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c
index dd86733896345ada154e5d80df14ca10ca53a00b..d9aebd90b5d74276541e74e00f687d70dc54c446 100644 (file)
--- a/tools/dumpconfig.c
+++ b/tools/dumpconfig.c
@@ -126,6 +126,9 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv)
                                  "no effect with --type current");
                        return EINVALID_CMD_LINE;
                }
+       } else if (arg_count(cmd, mergedconfig_ARG)) {
+               log_error("--mergedconfig has no effect without --type current");
+               return EINVALID_CMD_LINE;
        }
 
        if (!_get_vsn(cmd, &tree_spec.version))