persist: use vgid in the key file name

adding a new helper function to create key file path.

Including vgid protects against cases of reading a
stale key file that was left over from a previous VG
with the same name.

diff --git a/lib/device/persist.c b/lib/device/persist.c
index da17b33d248ab3bfaf90344f82e6a23a63f98d47..2ae027087c94c6423894fb86fade0d26c53e2138 100644 (file)
--- a/lib/device/persist.c
+++ b/lib/device/persist.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
+#include <dirent.h>
 #include <sys/ioctl.h>
 #include <scsi/sg.h>
 
@@ -124,29 +125,70 @@ static int parse_prkey(const char *ptr, uint64_t *prkey)
        return 1;
 }
 
-void persist_key_file_remove(struct cmd_context *cmd, struct volume_group *vg)
+/*
+ * If there was previously a different VG with the same name (and unknown vgid),
+ * remove the key file that it used.
+ */
+void persist_key_file_remove_name(struct cmd_context *cmd, const char *vg_name)
 {
+       DIR *dir;
+       struct dirent *de;
        char path[PATH_MAX] = { 0 };
+       char name[PATH_MAX] = { 0 };
+       int namelen;
 
-       if (dm_snprintf(path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", vg->name) < 0)
+       if (dm_snprintf(name, sizeof(name), "persist_key_%s", vg_name) < 0)
                return;
+       namelen = strlen(name);
+
+       if (!(dir = opendir("/var/lib/lvm")))
+               return;
+
+       while ((de = readdir(dir))) {
+               if (de->d_name[0] == '.')
+                       continue;
+               if (!strncmp(de->d_name, name, namelen)) {
+                       if (dm_snprintf(path, sizeof(path), "/var/lib/lvm/%s", de->d_name) < 0)
+                               continue;
+                       if (unlink(path))
+                               log_sys_debug("unlink", path);
+               }
+       }
+
+       (void) closedir(dir);
+}
+
+static void create_persist_key_path(struct volume_group *vg, const char *vg_name, char *path)
+{
+       char vgid[ID_LEN + 1] __attribute__((aligned(8)));
+
+       vgid[ID_LEN] = 0;
+       memcpy(vgid, &vg->id.uuid, ID_LEN);
+
+       (void) dm_snprintf(path, PATH_MAX, "/var/lib/lvm/persist_key_%s_%s", vg_name, vgid);
+}
+
+void persist_key_file_remove(struct cmd_context *cmd, struct volume_group *vg)
+{
+       char path[PATH_MAX] = { 0 };
+
+       create_persist_key_path(vg, vg->name, path);
 
        if (unlink(path))
                log_sys_debug("unlink", path);
 }
 
-void persist_key_file_rename(const char *old_name, const char *new_name)
+void persist_key_file_rename(struct volume_group *vg, const char *old_name, const char *new_name)
 {
        char old_path[PATH_MAX] = { 0 };
        char new_path[PATH_MAX] = { 0 };
        struct stat info;
 
-       if (dm_snprintf(old_path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", old_name) < 0)
-               return;
+       create_persist_key_path(vg, old_name, old_path);
+       create_persist_key_path(vg, new_name, new_path);
+
        if (stat(old_path, &info))
                return;
-       if (dm_snprintf(new_path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", new_name) < 0)
-               return;
        if (rename(old_path, new_path) < 0)
                log_warn("WARNING: Failed to rename %s", old_path);
 }
@@ -156,8 +198,7 @@ static int key_file_exists(struct cmd_context *cmd, struct volume_group *vg)
        char path[PATH_MAX] = { 0 };
        struct stat info;
 
-       if (dm_snprintf(path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", vg->name) < 0)
-               return 0;
+       create_persist_key_path(vg, vg->name, path);
 
        if (!stat(path, &info))
                return 1;
@@ -178,8 +219,7 @@ static int read_key_file(struct cmd_context *cmd, struct volume_group *vg,
        uint32_t found_gen = 0;
        FILE *fp;
 
-       if (dm_snprintf(path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", vg->name) < 0)
-               return 0;
+       create_persist_key_path(vg, vg->name, path);
 
        if (!(fp = fopen(path, "r"))) {
                log_debug("key_file: cannot open %s", path);
@@ -245,8 +285,7 @@ static int write_key_file(struct cmd_context *cmd, struct volume_group *vg, uint
        char path[PATH_MAX] = { 0 };
        FILE *fp;
 
-       if (dm_snprintf(path, PATH_MAX-1, "/var/lib/lvm/persist_key_%s", vg->name) < 0)
-               return 0;
+       create_persist_key_path(vg, vg->name, path);
 
        if (!(fp = fopen(path, "w"))) {
                log_debug("Failed to create key file");

diff --git a/lib/device/persist.h b/lib/device/persist.h
index 479c3708a2c941f61b59a1e2dc4a4704fc16bf80..242bb45e314fd18fe2e174dcb29a693a4dd7e11e 100644 (file)
--- a/lib/device/persist.h
+++ b/lib/device/persist.h
@@ -54,8 +54,9 @@ int persist_is_started(struct cmd_context *cmd, struct volume_group *vg, int may
 
 int persist_key_update(struct cmd_context *cmd, struct volume_group *vg, uint32_t prev_gen);
 
+void persist_key_file_remove_name(struct cmd_context *cmd, const char *vg_name);
 void persist_key_file_remove(struct cmd_context *cmd, struct volume_group *vg);
-void persist_key_file_rename(const char *old_name, const char *new_name);
+void persist_key_file_rename(struct volume_group *vg, const char *old_name, const char *new_name);
 
 int dev_read_reservation_nvme(struct cmd_context *cmd, struct device *dev, uint64_t *holder_ret, int *prtype_ret);
 

diff --git a/tools/vgrename.c b/tools/vgrename.c
index 27ae604dafdae715c6dd2e50e7f67919f50bd84e..6143f721d7412720d6402358c48b699d15c9b695 100644 (file)
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -114,7 +114,7 @@ static int _vgrename_single(struct cmd_context *cmd, const char *vg_name,
        }
 
        if (vg->pr)
-               persist_key_file_rename(vg_name, vp->vg_name_new);
+               persist_key_file_rename(vg, vg_name, vp->vg_name_new);
 
        /* Change the volume group name */
        vg_rename(cmd, vg, vp->vg_name_new);