diff options
| author | David Teigland <teigland@redhat.com> | 2022-12-01 10:03:06 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2022-12-01 10:03:06 -0600 |
| commit | f80273a1071532115219ea7c23054e6bbb096039 (patch) | |
| tree | 38e0ad0fedf2fb14a7d0763a2c93abc4041cd10b | |
| parent | 55b29c1c3d4b5c1366ec0a24fb680cfb81fc4961 (diff) | |
| download | lvm2-f80273a1071532115219ea7c23054e6bbb096039.tar.gz | |
lvmcache: fix strncpy len for wwid
| -rw-r--r-- | lib/cache/lvmcache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 1ae63b3fc..ec32b3be9 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -654,13 +654,13 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in if (dev_is_mp) { if ((wwid1 = dev_mpath_component_wwid(cmd, dev))) { - strncpy(wwid1_buf, wwid1, DEV_WWID_SIZE); + strncpy(wwid1_buf, wwid1, DEV_WWID_SIZE-1); dev_mp = dev; dev1 = dev; } } else { if ((wwid1 = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID))) { - strncpy(wwid1_buf, wwid1, DEV_WWID_SIZE); + strncpy(wwid1_buf, wwid1, DEV_WWID_SIZE-1); free((char *)wwid1); dev1 = dev; } @@ -673,10 +673,10 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in if (dev_is_mp) { if ((wwid = dev_mpath_component_wwid(cmd, dev))) - strncpy(wwid_buf, wwid, DEV_WWID_SIZE); + strncpy(wwid_buf, wwid, DEV_WWID_SIZE-1); } else { if ((wwid = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID))) { - strncpy(wwid_buf, wwid, DEV_WWID_SIZE); + strncpy(wwid_buf, wwid, DEV_WWID_SIZE-1); free((char *)wwid); } } @@ -692,7 +692,7 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in continue; if (!wwid1_buf[0]) { - memcpy(wwid1_buf, wwid_buf, DEV_WWID_SIZE); + memcpy(wwid1_buf, wwid_buf, DEV_WWID_SIZE-1); dev1 = dev; continue; } |