shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Revert "lvmcache: check for too long pvid"

Browse Source 
This reverts commit 70db1d523d.
Since we use 'strncpy' even for case where it exactly matches
the buffer size and \0 is not expected to be added there.
This commit is contained in:
Zdenek Kabelac 2015-08-18 15:21:48 +02:00
parent b193809987
commit 28b4fa3e27
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cache/lvmcache.c vendored
View File

@ -1178,12 +1178,7 @@ static int _lvmcache_update_pvid(struct lvmcache_info *info, const char *pvid)
return 1; return 1;
if (*info->dev->pvid) if (*info->dev->pvid)
dm_hash_remove(_pvid_hash, info->dev->pvid); dm_hash_remove(_pvid_hash, info->dev->pvid);
strncpy(info->dev->pvid, pvid, sizeof(info->dev->pvid));
if (!dm_strncpy(info->dev->pvid, pvid, sizeof(info->dev->pvid))){
log_error("_lvmcache_update: too long pvid: %s.", pvid);
return 0;
}
if (!dm_hash_insert(_pvid_hash, pvid, info)) { if (!dm_hash_insert(_pvid_hash, pvid, info)) {
log_error("_lvmcache_update: pvid insertion failed: %s", pvid); log_error("_lvmcache_update: pvid insertion failed: %s", pvid);
return 0; return 0;

8
lib/format_text/text_label.c
View File

@ -94,11 +94,9 @@ static int _text_write(struct label *label, void *buf)
* PV header base * PV header base
*/ */
/* FIXME Move to where label is created */ /* FIXME Move to where label is created */
if (!dm_strncpy(label->type, LVM2_LABEL, sizeof(label->type)) || strncpy(label->type, LVM2_LABEL, sizeof(label->type));
!dm_strncpy((char *)lh->type, label->type, sizeof(label->type))) {
log_error(INTERNAL_ERROR "LVM2 label %s does not fit.", LVM2_LABEL); strncpy((char *)lh->type, label->type, sizeof(label->type));
return 0;
}
pvhdr = (struct pv_header *) ((char *) buf + xlate32(lh->offset_xl)); pvhdr = (struct pv_header *) ((char *) buf + xlate32(lh->offset_xl));
info = (struct lvmcache_info *) label->info; info = (struct lvmcache_info *) label->info;