shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvmcache: fix strncpy len for wwid

Browse Source
This commit is contained in:
David Teigland 2022-12-01 10:03:06 -06:00
parent 55b29c1c3d
commit f80273a107
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cache/lvmcache.c vendored
View File

@ -654,13 +654,13 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in
if (dev_is_mp) { if (dev_is_mp) {
if ((wwid1 = dev_mpath_component_wwid(cmd, dev))) { 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; dev_mp = dev;
dev1 = dev; dev1 = dev;
} }
} else { } else {
if ((wwid1 = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID))) { 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); free((char *)wwid1);
dev1 = dev; dev1 = dev;
} }
@ -673,10 +673,10 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in
if (dev_is_mp) { if (dev_is_mp) {
if ((wwid = dev_mpath_component_wwid(cmd, dev))) if ((wwid = dev_mpath_component_wwid(cmd, dev)))
strncpy(wwid_buf, wwid, DEV_WWID_SIZE); strncpy(wwid_buf, wwid, DEV_WWID_SIZE-1);
} else { } else {
if ((wwid = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID))) { 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); free((char *)wwid);
} }
} }
@ -692,7 +692,7 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in
continue; continue;
if (!wwid1_buf[0]) { if (!wwid1_buf[0]) {
memcpy(wwid1_buf, wwid_buf, DEV_WWID_SIZE); memcpy(wwid1_buf, wwid_buf, DEV_WWID_SIZE-1);
dev1 = dev; dev1 = dev;
continue; continue;
} }