diff options
| author | David Teigland <teigland@redhat.com> | 2021-10-13 16:26:00 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2021-10-13 17:30:21 -0500 |
| commit | e88163ceac0ca7d78ab728867a6e84d0e535ad1d (patch) | |
| tree | 345a4ed5006aa372f69edd0f6f6ec649b74b958c | |
| parent | 6fb497ef42a5f8324a90cb93734cd8071ed0dc0b (diff) | |
| download | lvm2-e88163ceac0ca7d78ab728867a6e84d0e535ad1d.tar.gz | |
fix lvmcache_add log_debug pvid
from previous cleanup
| -rw-r--r-- | lib/cache/lvmcache.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index e04f00f2d..2c4254324 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -2168,15 +2168,17 @@ struct lvmcache_info *lvmcache_add(struct cmd_context *cmd, struct labeller *lab { const char *pvid = pvid_arg; const char *vgid = vgid_arg; - char pvid_dashed[64] __attribute__((aligned(8))); struct lvmcache_vgsummary vgsummary = { 0 }; struct lvmcache_info *info; struct lvmcache_info *info_lookup; struct device_list *devl; int created = 0; - if (!id_write_format((const struct id *)&pvid, pvid_dashed, sizeof(pvid_dashed))) - stack; + /* + * Note: ensure that callers of lvmcache_add() pass null terminated + * pvid and vgid strings, and do not pass char* that is type cast + * from struct id. + */ log_debug_cache("Found PVID %s on %s", pvid, dev_name(dev)); @@ -2206,7 +2208,7 @@ struct lvmcache_info *lvmcache_add(struct cmd_context *cmd, struct labeller *lab if (!created) { if (info->dev != dev) { log_debug_cache("Saving initial duplicate device %s previously seen on %s with PVID %s.", - dev_name(dev), dev_name(info->dev), pvid_dashed); + dev_name(dev), dev_name(info->dev), pvid); memset(&dev->pvid, 0, sizeof(dev->pvid)); memcpy(dev->pvid, pvid, ID_LEN); |